[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Erc-commit] [commit][emacs22] Makefile: Improve Debian package building
From: |
mwolson |
Subject: |
[Erc-commit] [commit][emacs22] Makefile: Improve Debian package building |
Date: |
Sun, 14 Oct 2007 00:49:00 -0400 |
commit 5896ddfe43844ddf8cbb22498c61b2cb2ff21b47
Author: Michael Olson <address@hidden>
Date: Mon May 21 00:39:10 2007 +0000
Makefile: Improve Debian package building
2007-05-21 Michael Olson <address@hidden>
* Makefile (SOURCE): Remove erc-pkg.el.
(debclean): New rule to clean old Debian packages of ERC.
(debprepare): Don't modify the released tarball, but copy it as
the .orig.tar.gz file.
(debrelease. debrevision): Remove.
(debinstall): New target that copies the generated Debian file to
a distro-specific location.
(deb): New rule that chains together the stages in building a
Debian package.
git-archimport-id: address@hidden/erc--rel--5.2--patch-20
diff --git a/ChangeLog b/ChangeLog
index b2f86df..f628f71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-21 Michael Olson <address@hidden>
+
+ * Makefile (SOURCE): Remove erc-pkg.el.
+ (debclean): New rule to clean old Debian packages of ERC.
+ (debprepare): Don't modify the released tarball, but copy it as
+ the .orig.tar.gz file.
+ (debrelease. debrevision): Remove.
+ (debinstall): New target that copies the generated Debian file to
+ a distro-specific location.
+ (deb): New rule that chains together the stages in building a
+ Debian package.
+
2007-05-19 Michael Olson <address@hidden>
* Makefile (ELPA): New variable that contains the location of my
diff --git a/Makefile b/Makefile
index 365709c..1f1d354 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ EXTRAS = erc-bbdb.el erc-chess.el erc-list.el erc-speak.el \
README.extras COPYING
ALLSOURCE = $(wildcard *.el)
-SOURCE = $(filter-out $(SPECIAL) $(UNCOMPILED), $(ALLSOURCE))
+SOURCE = $(filter-out $(SPECIAL) $(UNCOMPILED) erc-pkg.el, $(ALLSOURCE))
TARGET = $(patsubst %.el,%.elc,$(SPECIAL) $(SOURCE))
MANUAL = erc
MISC = AUTHORS COPYING CREDITS HISTORY NEWS README Makefile ChangeLog \
@@ -91,14 +91,21 @@ distclean:
-rm -f $(MANUAL).info $(MANUAL).html $(TARGET)
-rm -Rf ../$(SNAPDIR)
-debprepare: $(ALLSOURCE) $(SPECIAL) distclean
- mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
- cp $(ALLSOURCE) $(SPECIAL) $(MISC) ../$(SNAPDIR)
- cp -r images ../$(SNAPDIR)
- test -d ../$(SNAPDIR)/images/.arch-ids && rm -R \
- ../$(SNAPDIR)/images/.arch-ids || :
- test -d ../$(SNAPDIR)/images/CVS && rm -R \
- ../$(SNAPDIR)/images/.arch-ids || :
+debclean:
+ -rm -f ../../dist/$(DISTRIBUTOR)/erc_*
+ -rm -f ../erc_$(VERSION)*
+
+debprepare:
+ -rm -Rf ../$(SNAPDIR)
+ cp ../erc-$(VERSION).tar.gz ../erc_$(VERSION).orig.tar.gz
+ (cd .. && tar -xzf erc_$(VERSION).orig.tar.gz)
+ cp -R debian ../$(SNAPDIR)
+ test -d ../$(SNAPDIR)/debian/.arch-ids && rm -Rf \
+ ../$(SNAPDIR)/debian/.arch-ids \
+ ../$(SNAPDIR)/debian/maint/.arch-ids \
+ ../$(SNAPDIR)/debian/scripts/.arch-ids || :
+ test -d ../$(SNAPDIR)/debian/\{arch\} && rm -Rf \
+ ../$(SNAPDIR)/debian/\{arch\}
debbuild:
(cd ../$(SNAPDIR) && \
@@ -112,38 +119,10 @@ debbuild:
echo "Done running linda." && \
debsign)
-debrelease: debprepare
- -rm -f ../../dist/$(DISTRIBUTOR)/erc_*
- -rm -f ../erc_$(VERSION)*
- (cd .. && tar -czf erc_$(VERSION).orig.tar.gz $(SNAPDIR))
- cp -R debian ../$(SNAPDIR)
- test -d ../$(SNAPDIR)/debian/CVS && rm -R \
- ../$(SNAPDIR)/debian/CVS \
- ../$(SNAPDIR)/debian/maint/CVS \
- ../$(SNAPDIR)/debian/scripts/CVS || :
- test -d ../$(SNAPDIR)/debian/.arch-ids && rm -R \
- ../$(SNAPDIR)/debian/.arch-ids \
- ../$(SNAPDIR)/debian/maint/.arch-ids \
- ../$(SNAPDIR)/debian/scripts/.arch-ids || :
- $(MAKE) debbuild
+debinstall:
cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
-debrevision:
- -rm -f ../../dist/$(DISTRIBUTOR)/erc_*
- -rm -f ../erc_$(VERSION)-*
- -rm -fr ../erc-$(VERSION)
- $(MAKE) debprepare
- cp -R debian ../$(SNAPDIR)
- test -d ../$(SNAPDIR)/debian/CVS && rm -R \
- ../$(SNAPDIR)/debian/CVS \
- ../$(SNAPDIR)/debian/maint/CVS \
- ../$(SNAPDIR)/debian/scripts/CVS || :
- test -d ../$(SNAPDIR)/debian/.arch-ids && rm -R \
- ../$(SNAPDIR)/debian/.arch-ids \
- ../$(SNAPDIR)/debian/maint/.arch-ids \
- ../$(SNAPDIR)/debian/scripts/.arch-ids || :
- $(MAKE) debbuild
- cp ../erc_$(VERSION)* ../../dist/$(DISTRIBUTOR)
+deb: debclean debprepare debbuild debinstall
release: autoloads distclean
mkdir ../$(SNAPDIR) && chmod 0755 ../$(SNAPDIR)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Erc-commit] [commit][emacs22] Makefile: Improve Debian package building,
mwolson <=