diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-28 15:26:25 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-04-03 13:16:56 +0000 |
| commit | ca0c54d0fe3812cec64e5c7cc83309d4397f5e0a (patch) | |
| tree | 990c5405a133c9b8aafbf0ccc36ff5a83aec7359 /Makefile.in | |
| parent | 35b75ed510f49ff64cd86b38e228c2b5b9a9f3fc (diff) | |
Make autogen.sh prefer to read an autogen.input file
For backward compatibility, an autogen.lastrun file will still be used if it
exists and autogen.input does not exist. The recommended workflow is now to
keep the configuration parametets in autogen.input which is never written by
autogen.sh.
Most (?) developers used to treat autogen.lastrun as a valuable parameter file
to be edited manually anyway, and not as an ad-hoc backup copy of command-line
parameters last used. The name autogen.input better reflects this usage.
Change-Id: I7e3c747fa95e9f2f0bc44036419aaab8f4ad01e7
Reviewed-on: https://gerrit.libreoffice.org/3111
Reviewed-by: Michael Meeks <michael.meeks@suse.com>
Tested-by: Michael Meeks <michael.meeks@suse.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index f19de69c3c1f..ecfbc1c6a2db 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,16 +33,17 @@ $(BUILDDIR)/config_host.mk : \ $(SRCDIR)/Makefile.in \ $(SRCDIR)/instsetoo_native/util/openoffice.lst.in \ $(SRCDIR)/configure.ac \ - $(BUILDDIR)/autogen.lastrun + $(if $(wildcard $(BUILDDIR)/autogen.input),$(BUILDDIR)/autogen.input,$(if $(wildcard $(BUILDDIR)/autogen.lastrun),$(BUILDDIR)/autogen.lastrun)) $(SRCDIR)/autogen.sh -# dummy rule in case any of the above prerequisites are removed, so that a stale -# Makefile still triggers autogen.sh, or in case autogen.lastrun does not yet -# exist +# dummy rule in case any of the above prerequisites are removed, so +# that a stale Makefile still triggers autogen.sh, or in case +# autogen.input does not exist, or autogen.lastrun does not yet exist $(SRCDIR)/config_host.mk.in \ $(SRCDIR)/Makefile.in \ $(SRCDIR)/instsetoo_native/util/openoffice.lst.in \ $(SRCDIR)/configure.ac \ +$(BUILDDIR)/autogen.input \ $(BUILDDIR)/autogen.lastrun: @true |