[Erc-commit] [commit][emacs22] Merged from erc--main--0

[mwolson]

commit 3c20fa903ac656892c91b35003294bdaf755228a
Author: Michael Olson <address@hidden>
Date:   Sun Apr 1 17:22:36 2007 +0000

    Merged from erc--main--0
    
    Patches applied:
    
     * address@hidden/erc--main--0--patch-136
       Makefile: Add DISTRIBUTOR variable
    git-archimport-id: address@hidden/erc--rel--5.2--patch-17

diff --git a/ChangeLog b/ChangeLog
index 8822140..8e0fd37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
        tarball.
        (upload-extras): New rule to upload the extras tarball.  It's
        yucky to replicate upload, but oh well.
+       (DISTRIBUTOR): New variable used to differentiate between building
+       packages for Ubuntu and Debian.
+       (debrelease, debrevision): Use it.
 
        * NEWS: Mention extras tarball.  Note which files have been
        renamed.  Note that erc-list is enabled by default, except in
diff --git a/Makefile b/Makefile
index 93b9914..a504329 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,9 @@ PREFIX   = /usr/local
 ELISPDIR = $(PREFIX)/share/emacs/site-lisp/erc
 INFODIR  = $(PREFIX)/info
 
+# Used to differentiate building packages for Debian and Ubuntu
+DISTRIBUTOR = debian
+
 # XEmacs users will probably want the following settings.
 #EMACS    = xemacs
 #SITEFLAG = -no-site-file
@@ -104,7 +107,7 @@ debbuild:
          debsign)
 
 debrelease: debprepare
-       -rm -f ../../dist/erc_*
+       -rm -f ../../dist/$(DISTRIBUTOR)/erc_*
        -rm -f ../erc_$(VERSION)*
        (cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
        cp -R debian ../$(SNAPDIR)
@@ -117,10 +120,10 @@ debrelease: debprepare
          ../$(SNAPDIR)/debian/maint/.arch-ids \
          ../$(SNAPDIR)/debian/scripts/.arch-ids || :
        $(MAKE) debbuild
-       cp ../erc_$(VERSION)* ../../dist
+       cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
 
 debrevision:
-       -rm -f ../../dist/erc_*
+       -rm -f ../../dist/$(DISTRIBUTOR)/erc_*
        -rm -f ../erc_$(VERSION)-*
        -rm -fr ../erc-$(VERSION)
        $(MAKE) debprepare
@@ -134,7 +137,7 @@ debrevision:
          ../$(SNAPDIR)/debian/maint/.arch-ids \
          ../$(SNAPDIR)/debian/scripts/.arch-ids || :
        $(MAKE) debbuild
-       cp ../erc_$(VERSION)* ../../dist
+       cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
 
 release: autoloads distclean
        mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)