From 5e80dcf552744ee39bb695ca9f385a244c34712a Mon Sep 17 00:00:00 2001 From: Michael Olson Date: Sun, 29 Jul 2007 18:02:04 +0000 Subject: [PATCH] Change build system so that changes to Makefile.defs don't get tracked 2007-07-29 Michael Olson * 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 --- .arch-inventory | 3 +-- ChangeLog | 12 ++++++++++++ Makefile | 5 ++++- Makefile.defs => Makefile.defs.default | 6 ++++++ contrib/Makefile | 5 ++++- examples/Makefile | 5 ++++- experimental/Makefile | 5 ++++- lisp/Makefile | 5 ++++- .arch-inventory => texi/.arch-inventory | 0 texi/Makefile | 5 ++++- 10 files changed, 43 insertions(+), 8 deletions(-) rename Makefile.defs => Makefile.defs.default (84%) copy .arch-inventory => texi/.arch-inventory (100%) diff --git a/.arch-inventory b/.arch-inventory index afe1b72..998877e 100644 --- a/.arch-inventory +++ b/.arch-inventory @@ -1,2 +1 @@ -precious ^(muse\.info)$ -# arch-tag: 658b1292-2272-4ccd-8da2-1e12604143ed \ No newline at end of file +precious ^(Makefile\.defs)$ diff --git a/ChangeLog b/ChangeLog index a3df20d..f3f5476 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-07-29 Michael Olson + + * 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 * lisp/muse-latex.el (muse-latex-markup-strings): Change rule diff --git a/Makefile b/Makefile index 5a08827..44696cd 100644 --- a/Makefile +++ b/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 diff --git a/Makefile.defs b/Makefile.defs.default similarity index 84% rename from Makefile.defs rename to Makefile.defs.default index f6e69b5..bd37741 100644 --- a/Makefile.defs +++ b/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 diff --git a/contrib/Makefile b/contrib/Makefile index e521cf7..0783cc9 100644 --- a/contrib/Makefile +++ b/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)) diff --git a/examples/Makefile b/examples/Makefile index 7ed2f7d..411f215 100644 --- a/examples/Makefile +++ b/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 diff --git a/experimental/Makefile b/experimental/Makefile index 111fb3b..4a7dcd9 100644 --- a/experimental/Makefile +++ b/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)) diff --git a/lisp/Makefile b/lisp/Makefile index 5a2cc22..0c6d9bb 100644 --- a/lisp/Makefile +++ b/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)) diff --git a/.arch-inventory b/texi/.arch-inventory similarity index 100% copy from .arch-inventory copy to texi/.arch-inventory diff --git a/texi/Makefile b/texi/Makefile index f2547a3..12c0ad4 100644 --- a/texi/Makefile +++ b/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 -- 2.11.4.GIT