From: Alexandre Duret-Lutz Date: Fri, 9 Nov 2001 16:25:02 +0000 (+0000) Subject: Fix for nobase.test: X-Git-Tag: Release-1-5b~32 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=14c86a49b543a35b06483a2a1b96cd2c6b3e45bb;p=automake.git Fix for nobase.test: * lib/am/header-vars.am (install_sh_DATA): New. * lib/am/data.am (install-%DIR%%PRIMARY%): Declare and use %DIR%%PRIMARY%_INSTALL, and set it to $(install_sh_DATA) instead of $(INSTALL_DATA) for nobase_ targets. * lib/am/lisp.am (install-%DIR%LISP): Likewise. * lib/am/python.am (install-%DIR%PYTHON): Likewise. * tests/nobase.test (configure.in): Append AC_OUTPUT. * tests/Makefile.am (XFAIL_TESTS): Remove nobase.test. --- diff --git a/ChangeLog b/ChangeLog index 811e9274..08a7142a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2001-10-31 Alexandre Duret-Lutz + + Fix for nobase.test: + * lib/am/header-vars.am (install_sh_DATA): New. + * lib/am/data.am (install-%DIR%%PRIMARY%): Declare and use + %DIR%%PRIMARY%_INSTALL, and set it to $(install_sh_DATA) instead + of $(INSTALL_DATA) for nobase_ targets. + * lib/am/lisp.am (install-%DIR%LISP): Likewise. + * lib/am/python.am (install-%DIR%PYTHON): Likewise. + * tests/nobase.test (configure.in): Append AC_OUTPUT. + * tests/Makefile.am (XFAIL_TESTS): Remove nobase.test. + 2001-11-08 Akim Demaille * automake.texi: Remove references to stamp-h.in, which no longer diff --git a/NEWS b/NEWS index ab550c30..947bd82e 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,8 @@ New in 1.5a: and AC_). * `#line' of Lex and Yacc files are properly set. * Fixed CDPATH portability problems, in particular for MacOS X. +* Fixed handling of nobase_ targets. +* Fixed support of implicit rules leading to .lo objects. New in 1.5: * Support for `configure.ac'. diff --git a/lib/am/data.am b/lib/am/data.am index f7b48c27..3187e068 100644 --- a/lib/am/data.am +++ b/lib/am/data.am @@ -22,6 +22,8 @@ if %?INSTALL% _am_installdirs += $(DESTDIR)$(%NDIR%dir) +?BASE?%DIR%%PRIMARY%_INSTALL = $(INSTALL_%ONE_PRIMARY%) +?!BASE?%DIR%%PRIMARY%_INSTALL = $(install_sh_DATA) ?EXEC?.PHONY install-exec-am: install-%DIR%%PRIMARY% ?!EXEC?.PHONY install-data-am: install-%DIR%%PRIMARY% install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%) @@ -33,12 +35,12 @@ install-%DIR%%PRIMARY%: $(%DIR%_%PRIMARY%) ## A file can be in the source directory or the build directory. if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ## If the _%PRIMARY% variable has an entry like foo/bar, install it as -## $(destdir)/bar, not $(destdir)/foo/bar. The user can always make a -## new dir variable for the latter case. +## $(destdir)/bar, not $(destdir)/foo/bar. The user can make a +## new dir variable or use a nobase_ target for the latter case. ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_%ONE_PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ - $(INSTALL_%ONE_PRIMARY%) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ + echo " $(%DIR%%PRIMARY%_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(%DIR%%PRIMARY%_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ done endif %?INSTALL% diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index a62cb58f..aea1311a 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -64,6 +64,7 @@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 3ef098db..e8071b77 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -36,6 +36,8 @@ lispdir = @lispdir@ if %?INSTALL% _am_installdirs += $(DESTDIR)$(%NDIR%dir) +?BASE?%DIR%LISP_INSTALL = $(INSTALL_DATA) +?!BASE?%DIR%LISP_INSTALL = $(install_sh_DATA) ?EXEC?.PHONY install-exec-am: install-%DIR%LISP ?!EXEC?.PHONY install-data-am: install-%DIR%LISP install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES) @@ -50,12 +52,12 @@ install-%DIR%LISP: $(%DIR%_LISP) $(ELCFILES) if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ?BASE? f="`echo $$p | sed -e 's|^.*/||'`"; \ ?!BASE? f="$$p"; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ + echo " $(%DIR%LISP_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f"; \ + $(%DIR%LISP_INSTALL) $$d$$p $(DESTDIR)$(%NDIR%dir)/$$f; \ ## Only install .elc file if it exists. if test -f $${p}c; then \ - echo " $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \ - $(INSTALL_DATA) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \ + echo " $(%DIR%LISP_INSTALL) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c"; \ + $(%DIR%LISP_INSTALL) $${p}c $(DESTDIR)$(%NDIR%dir)/$${f}c; \ else : ; fi; \ done; \ else : ; fi diff --git a/lib/am/python.am b/lib/am/python.am index 4686576c..cfe5d52b 100644 --- a/lib/am/python.am +++ b/lib/am/python.am @@ -23,6 +23,8 @@ if %?INSTALL% _am_installdirs += $(DESTDIR)$(%NDIR%dir) +?BASE?%DIR%PYTHON_INSTALL = $(INSTALL_DATA) +?!BASE?%DIR%PYTHON_INSTALL = $(install_sh_DATA) ?EXEC?.PHONY install-exec-am: install-%DIR%PYTHON ?!EXEC?.PHONY install-data-am: install-%DIR%PYTHON install-%DIR%PYTHON: $(%DIR%_PYTHON) @@ -37,8 +39,8 @@ install-%DIR%PYTHON: $(%DIR%_PYTHON) ?!BASE? d="$$p"; \ dlist="$$dlist $$d"; \ ## Don't perform translation, since script name is important. - echo " $(INSTALL_PROGRAM) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$d"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$d; \ + echo " $(%DIR%PYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$d"; \ + $(%DIR%PYTHON_INSTALL) $(srcdir)/$$p $(DESTDIR)$(%NDIR%dir)/$$d; \ else :; fi; \ done; \ ## Byte-compile must be done at install time, since file times are diff --git a/stamp-vti b/stamp-vti index 33ff40b8..80eb78d3 100644 --- a/stamp-vti +++ b/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 5 November 2001 +@set UPDATED 9 November 2001 @set UPDATED-MONTH November 2001 @set EDITION 1.5a @set VERSION 1.5a diff --git a/tests/Makefile.am b/tests/Makefile.am index 62ef0973..f3b81289 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to create Makefile.in -XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test nobase.test +XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test TESTS = \ acinclude.test \ diff --git a/tests/Makefile.in b/tests/Makefile.in index cc713020..c038afed 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -48,6 +48,7 @@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ @@ -72,7 +73,7 @@ am__include = @am__include@ am__quote = @am__quote@ install_sh = @install_sh@ -XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test nobase.test +XFAIL_TESTS = condd.test subdir5.test auxdir2.test cond17.test TESTS = \ acinclude.test \ @@ -477,7 +478,6 @@ check-TESTS: $(TESTS) echo "$$dashes"; \ test "$$failed" -eq 0; \ else :; fi - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = .. diff --git a/tests/nobase.test b/tests/nobase.test index ce6a8311..888f340d 100755 --- a/tests/nobase.test +++ b/tests/nobase.test @@ -3,6 +3,10 @@ . $srcdir/defs || exit 1 +cat >> configure.in <<'EOF' +AC_OUTPUT +EOF + cat > Makefile.am << 'EOF' foodir = $(prefix)/foo nobase_foo_HEADERS = bar/baz.h diff --git a/version.texi b/version.texi index 33ff40b8..80eb78d3 100644 --- a/version.texi +++ b/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 5 November 2001 +@set UPDATED 9 November 2001 @set UPDATED-MONTH November 2001 @set EDITION 1.5a @set VERSION 1.5a