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 811e927443edca4dc0cb25d29a71404f21dcca8e..08a7142a8eab38b4c68da5f7ea81e93e573f375f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2001-10-31  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       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  <akim@epita.fr>
 
        * automake.texi: Remove references to stamp-h.in, which no longer

diff --git a/NEWS b/NEWS
index ab550c3050fbebe219ee8ea201e18d4bc460db18..947bd82e72993c53f01df666fbff6fecbaa3c0aa 100644 (file)
--- 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.
 \f
 New in 1.5:
 * Support for `configure.ac'.

diff --git a/lib/am/data.am b/lib/am/data.am
index f7b48c27e4ab8fd4594397ba82e9212538f27bf1..3187e06891ba5c587d3902198fc3ae57e37268b6 100644 (file)
--- 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 a62cb58fc25b61e295ed425b7e7718aedc0c3bb1..aea1311a0148722c45b45a92243a96e752a37881 100644 (file)
--- 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 3ef098db58c68d3ad19ee6d3ea0d9fd3b138359e..e8071b77210f9fca93fd3b4126b1a0697a0d9afb 100644 (file)
--- 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 4686576caea07e86fe03975bf351d207a710c933..cfe5d52baf1b0546fc337c6b4ccd9d853976d6d4 100644 (file)
--- 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 33ff40b8188fde32d6b9119b5acd96cf23f9bcd2..80eb78d3565cdef6dd41b58749703a6d093bc37a 100644 (file)
--- 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 62ef0973a65b7a379e1c8613d99df58e67f5a1d8..f3b81289f703464b632c8056307beffd6464c081 100644 (file)
--- 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 cc713020be3f2bc377a8955d918bf2c93d9e471c..c038afed59f4525132ed8a8cc62aaa96d02c9c86 100644 (file)
--- 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 ce6a83119d360a3ccf2e7fe72cd26cb6a7a4d710..888f340d47a62f62e0bcce76127991a865396953 100755 (executable)
--- 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 33ff40b8188fde32d6b9119b5acd96cf23f9bcd2..80eb78d3565cdef6dd41b58749703a6d093bc37a 100644 (file)
--- 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