[Erc-commit] [commit][emacs22] Include erc-nicklist.el and images in extras tarball

[mwolson]

commit 3d13c20b2cdb89aac014e46119bb1b2c8119b671
Author: Michael Olson <address@hidden>
Date:   Mon May 21 00:52:38 2007 +0000

    Include erc-nicklist.el and images in extras tarball
    
    2007-05-21  Michael Olson  <address@hidden>
    
        * Makefile (EXTRAS): Add erc-nicklist.el, since it is not
            release-quality.
        (extras): Copy images directory.
    git-archimport-id: address@hidden/erc--rel--5.2--patch-22

diff --git a/ChangeLog b/ChangeLog
index 8c304d3..ef243df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@
        a distro-specific location.
        (deb): New rule that chains together the stages in building a
        Debian package.
+       (EXTRAS): Add erc-nicklist.el, since it is not release-quality.
+       (extras): Copy images directory.
 
        * erc-nicklist.el (erc-nicklist-icons-directory): Use
        locate-library to find the "images" directory.  This should be
diff --git a/Makefile b/Makefile
index 1f1d354..ca4ce8a 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ UNCOMPILED = erc-bbdb.el erc-chess.el erc-ibuffer.el 
erc-speak.el \
                erc-speedbar.el erc-compat.el
 
 # Files to include in the extras pack for Emacs 22
-EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-speak.el \
-                README.extras COPYING
+EXTRAS  = erc-bbdb.el erc-chess.el erc-list.el erc-nicklist.el \
+               erc-speak.el README.extras COPYING
 
 ALLSOURCE = $(wildcard *.el)
 SOURCE = $(filter-out $(SPECIAL) $(UNCOMPILED) erc-pkg.el, $(ALLSOURCE))
@@ -139,6 +139,11 @@ extras:
        -rm -Rf ../$(SNAPDIR)-extras
        mkdir ../$(SNAPDIR)-extras && chmod 0755 ../$(SNAPDIR)-extras
        cp $(EXTRAS) ../$(SNAPDIR)-extras
+       cp -r images ../$(SNAPDIR)-extras
+       test -d ../$(SNAPDIR)-extras/images/CVS && \
+         rm -R ../$(SNAPDIR)-extras/images/CVS || :
+       test -d ../$(SNAPDIR)-extras/images/.arch-ids && \
+         rm -R ../$(SNAPDIR)-extras/images/.arch-ids || :
        (cd .. && tar czf erc-$(VERSION)-extras.tar.gz $(SNAPDIR)-extras/*; \
          zip -r erc-$(VERSION)-extras.zip $(SNAPDIR)-extras)