diff options
| author | Jean Delvare <jdelvare@suse.de> | 2012-01-10 11:11:54 +0100 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2012-01-10 11:11:54 +0100 |
| commit | b2245d7cc4ea8e5ff90d1afb68b5059eefb8740a (patch) | |
| tree | 6f816850860b830275db5fbf7612763381f1e7ca | |
| parent | 79149cbf64b58f92cb6e9dfac92fd71a5a36993f (diff) | |
| download | quilt-b2245d7cc4ea8e5ff90d1afb68b5059eefb8740a.tar.gz | |
Store the quilt command reference once generated
This avoids generating it twice, once for README and once for quilt.1.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.in | 15 | ||||
| -rw-r--r-- | quilt.changes | 8 |
3 files changed, 16 insertions, 8 deletions
@@ -24,6 +24,7 @@ doc/quilt.dvi doc/quilt.log doc/quilt.ps doc/README +doc/reference lib/backup-files diff --git a/Makefile.in b/Makefile.in index 29cb31a..ba731f0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -107,7 +107,7 @@ DOC := $(DOC_IN) SRC += $(DOC_SRC) SRC += doc/main.tex doc/quilt.pdf doc/Makefile \ doc/README.MAIL doc/README.EMACS -DIRT += $(DOC_IN:%=doc/%) +DIRT += $(DOC_IN:%=doc/%) doc/reference MAN1 := doc/quilt.1 ifneq ($(POD2MAN),) @@ -190,12 +190,12 @@ po/quilt.pot: $(filter-out debian/control.in doc/quilt.1.in \ |$(MSGUNIQ) \ |$(MSGCAT) --force-po -F - $@ -o $@ -doc/README : doc/README.in $(QUILT:%=quilt/%) $(COMPAT) +doc/README : doc/README.in doc/reference @echo "README.in -> README" @while read line; do \ case "$$line" in \ '@REFERENCE''@') \ - $(MAKE) -s reference \ + cat doc/reference \ ;; \ *) \ echo $$line \ @@ -203,15 +203,15 @@ doc/README : doc/README.in $(QUILT:%=quilt/%) $(COMPAT) esac ; \ done 2>&1 < $< > $@ -doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) $(COMPAT) +doc/quilt.1: doc/quilt.1.in doc/reference $(COMPAT) @echo "quilt.1.in -> quilt.1" @while read line; do \ case "$$line" in \ '@REFERENCE''@') \ - $(MAKE) -s reference | \ $(SED) -e 's/^quilt \([^ ]*\)\(.*\)/.IP "\\fB\1\\fP\2 " 4/' \ -e $$'s/^ \\(-[^\t]*\\)\t\\?/.IP " \\1" 8\\\n/' \ -e $$'s/^ \t\\?//' \ + < doc/reference \ ;; \ *@DOCSUBDIR@*) \ echo "$$line" | \ @@ -223,8 +223,7 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) $(COMPAT) esac; \ done < $< 2>&1 > $@ -.PHONY :: reference -reference : $(QUILT:%=quilt/%) quilt/scripts/patchfns compat +doc/reference : bin/quilt $(QUILT:%=quilt/%) quilt/scripts/patchfns $(COMPAT) @unset LANG LC_MESSAGES LC_CTYPE LC_ALL; \ for i in $(QUILT); \ do \ @@ -234,7 +233,7 @@ reference : $(QUILT:%=quilt/%) quilt/scripts/patchfns compat done | \ $(SED) -e 's/\$$EDITOR ([^)]*)/$$EDITOR/' \ -e '/^$$/!s/^/ /' \ - -e 's/^ Usage: *//' + -e 's/^ Usage: *//' > $@ bin/guards.1 : bin/guards $(POD2MAN) $< > $@ diff --git a/quilt.changes b/quilt.changes index d734053..c02ca36 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,9 +1,17 @@ ------------------------------------------------------------------- +Tue Jan 10 11:11:13 CET 2012 - jdelvare@suse.de + +- + +------------------------------------------------------------------- Tue Jan 10 11:05:36 CET 2012 - jdelvare@suse.de - Makefile.in: No need to delete doc/quilt.1 twice on "make clean". - Makefile.in: Silent the generation of the quilt manual page, for consistency. +- Makefile.in: Store the quilt command reference once generated. + This avoids generating it twice, once for README and once for + quilt.1. ------------------------------------------------------------------- Mon Jan 9 20:49:04 CET 2012 - mquinson@debian.org |