diff options
| author | Miles Bader <miles@gnu.org> | 2004-06-11 02:39:51 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-06-11 02:39:51 +0000 |
| commit | 48d67035ea6651694878200f2284d329dfb2f3ad (patch) | |
| tree | c9761d5ca439338fb7bba368b8d01f17a046e18e /Makefile.in | |
| parent | e9efcef4e9f5a5fa96ef6ea2c6b4ecc412399550 (diff) | |
| download | emacs-48d67035ea6651694878200f2284d329dfb2f3ad.tar.gz | |
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396
Tweak arch tagging to make build/install-in-place less annoying
Previously, autoconf-created Makefiles and the like would contain
duplicate taglines (unfortunately, autoconf doesn't seem to have a
`strip in generated file' comment mechanism) leading to conflicts, and
installing in place would create unknown directories and copies of
source directories (leading to conflicts with the source directories).
This changeset makes all autoconf-processed files use explicit id-tags
and adds .arch-inventory entries to ignore installation directories.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 7bfed3fd5ea..28c3ff81b25 100644 --- a/Makefile.in +++ b/Makefile.in @@ -259,7 +259,8 @@ epaths-force: FRC -e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \ -e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \ -e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \ - -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ + -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \ + -e 's;/[*] *arch-tag:.*;/*;') && \ ${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h # For parallel make, src should be build before leim. @@ -753,5 +754,3 @@ bootstrap-clean-before: FRC -(cd lispref && $(MAKE) $(MFLAGS) clean) -(cd lispintro && $(MAKE) $(MFLAGS) clean) (cd leim; $(MAKE) $(MFLAGS) clean) - -# arch-tag: c1162ff6-e0a8-4366-bc1a-2eb544007156 |