[patch] DESTDIR and automake's own Makefile

[Christoph Pfisterer]

Hi!

The Makefile of automake-1.4 doesn't honor the DESTDIR variable in 
the install-data-hook rule, resulting in build errors when using 
DESTDIR (i.e. to build a package for a distribution). The files are 
installed correctly in $DESTDIR/.../share/automake/, but the 'chmod 
+x' is called with .../share/automake/. Patches for both Makefile.am 
and Makefile.in are below. The patch was taken against 1.4, but also 
applies cleanly to 1.4-p1, which has the same problem. I haven't 
checked CVS.

Hope this helps,
Christoph


Changelog entry:

2001-05-11  Christoph Pfisterer  <address@hidden>

       * Makefile.am: Added DESTDIR to install-data-hook rule.


Patch for Makefile.am:

--- automake-1.4/Makefile.am    Fri Jan 15 05:11:20 1999
+++ automake-1.4-patched/Makefile.am    Fri May 11 09:44:02 2001
@@ -29,7 +29,7 @@

 install-data-hook:
        @for prog in $(script_DATA); do \
-         chmod +x $(scriptdir)/$$prog; \
+         chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
        done

 EXTRA_DIST = acinstall $(pkgdata_DATA) $(script_DATA)


Patch for Makefile.in:

--- automake-1.4/Makefile.in    Fri Jan 15 07:55:38 1999
+++ automake-1.4-patched/Makefile.in    Fri May 11 09:44:42 2001
@@ -564,7 +564,7 @@

 install-data-hook:
        @for prog in $(script_DATA); do \
-         chmod +x $(scriptdir)/$$prog; \
+         chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
        done

 installcheck-local:

--
chrisp a.k.a. Christoph Pfisterer   "Any sufficiently advanced
address@hidden - http://chrisp.de      bug is indistinguishable
PGP key & geek code available        from a feature."