From 83470d715e3e546cb166a9ee305a6ac9b127068f Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Sat, 12 Aug 2006 19:23:17 +0000
Subject: [PATCH] Make sure the autoloads file is distributed with releases.

* Makefile: (realclean fullclean): Call realclean in subdirs, not
  distclean.
  (distclean): Don't call realclean, since this would wipe out our
  autoloads file.
  (dist): Use correct path to autoloads file.

* lisp/Makefile (distclean): Do the same thing as "clean", not
  "realclean".
git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-191
---
 ChangeLog     | 12 ++++++++++--
 Makefile      |  9 ++++++---
 Makefile.defs |  2 +-
 lisp/Makefile |  4 ++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c9dd28f..62b38b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,18 @@
 2006-08-12  Michael Olson  <mwolson@gnu.org>
 
-	* Makefile, experimental/Makefile (.PHONY): Don't use line
-	continuations.
+	* Makefile (.PHONY): Don't use line continuations.
+	(realclean fullclean): Call realclean in subdirs, not distclean.
+	(distclean): Don't call realclean, since this would wipe out our
+	autoloads file.
+	(dist): Use correct path to autoloads file.
 
 	* NEWS: Catch up with the latest changes.
 
+	* experimental/Makefile (.PHONY): Wrap long line.
+
+	* lisp/Makefile (distclean): Do the same thing as "clean", not
+	"realclean".
+
 	* lisp/muse-project.el (muse-project-get-applicable-style):
 	Indentation tweak.
 	(muse-project-ignore-regexp, muse-project-recurse-directory):
diff --git a/Makefile b/Makefile
index c3bd096..76ff9aa 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ clean:
 realclean fullclean: clean
 	-rm -f $(MANUAL).info $(MANUAL).html
 	for i in $(SUBDIRS); do \
-	 (cd $$i && $(MAKE) distclean); done
+	 (cd $$i && $(MAKE) realclean); done
 
 install-info: $(MANUAL).info
 	[ -d $(INFODIR) ] || install -d $(INFODIR)
@@ -56,14 +56,17 @@ install: install-bin install-info
 test: 
 	(cd lisp && $(MAKE) test)
 
-distclean: realclean
+distclean:
+	-rm -f $(MANUAL).info $(MANUAL).html
+	for i in $(SUBDIRS); do \
+	 (cd $$i && $(MAKE) distclean); done
 	-rm -fr ../$(PROJECT)-$(VERSION)
 
 dist: autoloads distclean
 	tla inventory -sB | tar -cf - --no-recursion -T- | \
 	  (mkdir -p ../$(PROJECT)-$(VERSION); cd ../$(PROJECT)-$(VERSION) && \
 	  tar xf -)
-	cp $(PROJECT)-autoloads.el ../$(PROJECT)-$(VERSION)
+	cp lisp/$(PROJECT)-autoloads.el ../$(PROJECT)-$(VERSION)
 	rm -fr ../$(PROJECT)-$(VERSION)/debian
 
 release: dist
diff --git a/Makefile.defs b/Makefile.defs
index 8e6f2f6..eac13e0 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -22,7 +22,7 @@ INSTALLINFO = install-info --info-dir=$(INFODIR)
 # Useful only for the maintainer
 PROJECT    = muse
 DEBNAME    = muse-el
-VERSION    = 3.02.91.arch.174
+VERSION    = 3.02.91.arch.191
 MANUAL     = muse
 LASTUPLOAD = 3.02.6-2
 BUILDOPTS  =
diff --git a/lisp/Makefile b/lisp/Makefile
index 77455c3..5a2cc22 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -23,10 +23,10 @@ $(PROJECT)-autoloads.el: $(EL)
 	@$(EMACS) -q $(SITEFLAG) -batch -l ../scripts/$(PROJECT)-build.el \
 		-f batch-byte-compile $<
 
-clean:
+clean distclean:
 	-rm -f *.elc *~
 
-realclean distclean fullclean: clean
+realclean fullclean: clean
 	-rm -f $(PROJECT)-autoloads.el
 
 install: autoloads $(ELC)
-- 
2.11.4.GIT