2000-12-20 Marc Espie <espie@openbsd.org>

	* automake.in (handle_texinfo): Make path of $vtexi explicit in
	dependency.
	* texi-vers.am: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 26017c3..cfcfa65 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-20  Marc Espie <espie@openbsd.org>
+
+       * automake.in (handle_texinfo): Make path of $vtexi explicit in
+       dependency.
+       * texi-vers.am: Likewise.
+
 2000-12-20  Tom Tromey  <tromey@redhat.com>
 
        From Kevin Ryde:

diff --git a/automake.in b/automake.in
index 8c3dbe5..5bc2efc 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2273,7 +2273,9 @@ sub handle_texinfo
        # dependency list.
        @texi_deps = ();
        push (@texi_deps, $info_cursor);
-       push (@texi_deps, $vtexi) if $vtexi;
+       # Prefix with $(srcdir) because some version of make won't
+       # work if the target has it and the dependency doesn't.
+       push (@texi_deps, '$(srcdir)/' . $vtexi) if $vtexi;
 
        # Canonicalize name first.
        ($canonical = $infobase) =~ tr/A-Za-z0-9_/_/c;

diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 3649221..5190157 100644 (file)
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -15,7 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@stamp-@VTI@
+$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-@VTI@
        @:
 
 ## Depend on configure.in so that version number updates cause a

diff --git a/texi-vers.am b/texi-vers.am
index 3649221..5190157 100644 (file)
--- a/texi-vers.am
+++ b/texi-vers.am
@@ -15,7 +15,7 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
-$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@stamp-@VTI@
+$(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-@VTI@
        @:
 
 ## Depend on configure.in so that version number updates cause a