From 5dfdeb4b117394311acb0ec1c0590ef96d6f5c57 Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Sat, 6 Jan 2007 23:29:01 +0000
Subject: [PATCH] Makefile: Keep track of distributor (debian/ubuntu)

2007-01-06  Michael Olson  <mwolson@gnu.org>

	* Makefile (debclean): New rule split from debrevision and
	debrelease.
	(debbuild): Take distributor into account.

	* Makefile.defs (DISTRIBUTOR): New field that tracks what
	vendor/distributor we are building for.
git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-266
---
 ChangeLog     |  9 +++++++++
 Makefile      | 14 +++++++-------
 Makefile.defs | 13 +++++++------
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6bdb0ea..f524df2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-01-06  Michael Olson  <mwolson@gnu.org>
+
+	* Makefile (debclean): New rule split from debrevision and
+	debrelease.
+	(debbuild): Take distributor into account.
+
+	* Makefile.defs (DISTRIBUTOR): New field that tracks what
+	vendor/distributor we are building for.
+
 2007-01-04  Michael Olson  <mwolson@gnu.org>
 
 	* lisp/muse-html.el (muse-html-src-tag): Remove initial blank
diff --git a/Makefile b/Makefile
index 094cd53..adb9f6c 100644
--- a/Makefile
+++ b/Makefile
@@ -77,21 +77,21 @@ debbuild:
 	  lintian -i ../$(DEBNAME)_$(VERSION)*.deb || : && \
 	  echo "Done running lintian." && \
 	  debsign)
-	cp ../$(DEBNAME)_$(VERSION)* ../../dist
+	cp ../$(DEBNAME)_$(VERSION)* ../../dist/$(DISTRIBUTOR)
 
-debrevision: dist
-	-rm -f ../../dist/$(DEBNAME)_*
-	-rm -f ../$(DEBNAME)_$(VERSION)-*
+debclean:
+	-rm -f ../../dist/$(DISTRIBUTOR)/$(DEBNAME)_*
 	-rm -fr ../$(DEBNAME)-$(VERSION)
+
+debrevision: debclean dist
+	-rm -f ../$(DEBNAME)_$(VERSION)-*
 	mv ../$(PROJECT)-$(VERSION) ../$(DEBNAME)-$(VERSION)
 	cp -r debian ../$(DEBNAME)-$(VERSION)
 	-rm -fr ../$(DEBNAME)-$(VERSION)/debian/.arch-ids
 	$(MAKE) debbuild
 
-debrelease: dist
-	-rm -f ../../dist/$(DEBNAME)_*
+debrelease: debclean dist
 	-rm -f ../$(DEBNAME)_$(VERSION)*
-	-rm -fr ../$(DEBNAME)-$(VERSION)
 	mv ../$(PROJECT)-$(VERSION) ../$(DEBNAME)-$(VERSION)
 	(cd .. && tar -czf $(DEBNAME)_$(VERSION).orig.tar.gz \
 	    $(DEBNAME)-$(VERSION))
diff --git a/Makefile.defs b/Makefile.defs
index fb29a75..63a9e51 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -20,9 +20,10 @@ INSTALLINFO = install-info --info-dir=$(INFODIR)
 #INSTALLINFO = install-info --section "Emacs" "emacs" --info-dir=$(INFODIR)
 
 # Useful only for the maintainer
-PROJECT    = muse
-DEBNAME    = muse-el
-VERSION    = 3.02.93
-MANUAL     = muse
-LASTUPLOAD = 3.02.8-1
-BUILDOPTS  =
+PROJECT     = muse
+DEBNAME     = muse-el
+VERSION     = 3.02.93.arch.265
+MANUAL      = muse
+LASTUPLOAD  = 3.02.8-1
+BUILDOPTS   =
+DISTRIBUTOR = debian
-- 
2.11.4.GIT