Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

0 comments on commit 5e80dcf

Please sign in to comment.
Something went wrong with that request. Please try again.