Permalink
Browse files

Change build system so that changes to Makefile.defs don't get tracked

2007-07-29  Michael Olson  <mwolson@gnu.org>

	* Makefile.defs.default: Rename from Makefile.defs.  This allows
	people to copy this file to Makefile.defs and make changes,
	without having the changes be accidentally committed.  If
	Makefile.defs does not exist, this file is read instead, in order
	to minimize inconvenience to the casual user.

	* Makefile, contrib/Makefile, examples/Makefile,
	experimental/Makefile, lisp/Makefile, texi/Makefile: Use either
	Makefile.defs.default or Makefile.defs.
git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-425
  • Loading branch information...
1 parent ee63070 commit 5e80dcf552744ee39bb695ca9f385a244c34712a @mwolson mwolson committed Jul 29, 2007
Showing with 45 additions and 8 deletions.
  1. +1 −2 .arch-inventory
  2. +12 −0 ChangeLog
  3. +4 −1 Makefile
  4. +6 −0 Makefile.defs → Makefile.defs.default
  5. +4 −1 contrib/Makefile
  6. +4 −1 examples/Makefile
  7. +4 −1 experimental/Makefile
  8. +4 −1 lisp/Makefile
  9. +2 −0 texi/.arch-inventory
  10. +4 −1 texi/Makefile
View
3 .arch-inventory
@@ -1,2 +1 @@
-precious ^(muse\.info)$
-# arch-tag: 658b1292-2272-4ccd-8da2-1e12604143ed
+precious ^(Makefile\.defs)$
View
12 ChangeLog
@@ -1,3 +1,15 @@
+2007-07-29 Michael Olson <mwolson@gnu.org>
+
+ * Makefile.defs.default: Rename from Makefile.defs. This allows
+ people to copy this file to Makefile.defs and make changes,
+ without having the changes be accidentally committed. If
+ Makefile.defs does not exist, this file is read instead, in order
+ to minimize inconvenience to the casual user.
+
+ * Makefile, contrib/Makefile, examples/Makefile,
+ experimental/Makefile, lisp/Makefile, texi/Makefile: Use either
+ Makefile.defs.default or Makefile.defs.
+
2007-07-29 Jean Magnan de Bornier <jean@bornier.net>
* lisp/muse-latex.el (muse-latex-markup-strings): Change rule
View
5 Makefile
@@ -3,7 +3,10 @@
.PHONY: test dist release debclean debprepare debbuild debinstall deb upload
.PHONY: elpa
-include Makefile.defs
+DEFS = $(shell test -f Makefile.defs && echo Makefile.defs \
+ || echo Makefile.defs.default)
+
+include $(DEFS)
SUBDIRS = lisp contrib examples experimental texi
View
6 Makefile.defs → Makefile.defs.default
@@ -1,4 +1,10 @@
# -*- Makefile -*-
+#
+# If you wish to modify this file, first copy it to a file called
+# Makefile.defs. The resulting Makefile.defs file may then be
+# modified.
+
+# Emacs options
EMACS = emacs
SITEFLAG = --no-site-file
View
5 contrib/Makefile
@@ -1,7 +1,10 @@
.PHONY: all contrib clean realclean distclean fullclean install
.PRECIOUS: %.elc
-include ../Makefile.defs
+DEFS = $(shell test -f ../Makefile.defs && echo ../Makefile.defs \
+ || echo ../Makefile.defs.default)
+
+include $(DEFS)
EL = $(wildcard *.el)
ELC = $(patsubst %.el,%.elc,$(EL))
View
5 examples/Makefile
@@ -1,7 +1,10 @@
.PHONY: all examples clean realclean distclean fullclean
.PRECIOUS: %.html %.pdf %.info
-include ../Makefile.defs
+DEFS = $(shell test -f ../Makefile.defs && echo ../Makefile.defs \
+ || echo ../Makefile.defs.default)
+
+include $(DEFS)
EXAMPLES = QuickStart.html QuickStart.pdf QuickStart.info
View
5 experimental/Makefile
@@ -2,7 +2,10 @@
.PHONY: install-uncompiled
.PRECIOUS: %.elc
-include ../Makefile.defs
+DEFS = $(shell test -f ../Makefile.defs && echo ../Makefile.defs \
+ || echo ../Makefile.defs.default)
+
+include $(DEFS)
EL = $(wildcard *.el)
ELC = $(patsubst %.el,%.elc,$(wildcard *.el))
View
5 lisp/Makefile
@@ -1,7 +1,10 @@
.PHONY: all lisp autoloads clean realclean distclean fullclean install test
.PRECIOUS: %.elc
-include ../Makefile.defs
+DEFS = $(shell test -f ../Makefile.defs && echo ../Makefile.defs \
+ || echo ../Makefile.defs.default)
+
+include $(DEFS)
EL = $(filter-out $(PROJECT)-autoloads.el,$(wildcard *.el))
ELC = $(patsubst %.el,%.elc,$(EL))
View
2 texi/.arch-inventory
@@ -0,0 +1,2 @@
+precious ^(muse\.info)$
+# arch-tag: 658b1292-2272-4ccd-8da2-1e12604143ed
View
5 texi/Makefile
@@ -1,7 +1,10 @@
.PHONY: all info-only doc clean realclean distclean fullclean install
.PRECIOUS: %.info %.html
-include ../Makefile.defs
+DEFS = $(shell test -f ../Makefile.defs && echo ../Makefile.defs \
+ || echo ../Makefile.defs.default)
+
+include $(DEFS)
all: doc

0 comments on commit 5e80dcf

Please sign in to comment.