Re: --program-prefix leads to broken libtoolize

[Scott James Remnant]

On Tue, 2004-02-03 at 20:56, Alexandre Duret-Lutz wrote:

> >>> "Scott" == Scott James Remnant <address@hidden> writes:
>  >> >> $ ls -1 /Network/Servers/cauchy/homes/thorin/gkeating/share/libtool/
>  >> >> gconfig.guess
>  >> >> gconfig.sub
>  >> >>
>  >> > Automake is applying the various program changes to _SCRIPTS...
>  >> >
>  >> > I don't even know *HOW* we can support program-prefix, program-suffix
>  >> > (and worst of all) program-transform-name ... I can't think of any way
>  >> > of getting the resulting transform into libtoolize; at least not one
>  >> > that doesn't make me violently sick.
>  >> 

Of course, we could just steal the following off Automake ;-)

Patch attached, okay to apply?

> [automake/lib/Makefile.am]
> ## These must all be executable when installed.  However, if we use
> ## _SCRIPTS, then the program transform will be applied, which is not
> ## what we want.  So we make them executable by hand.
> scriptdir = $(pkgvdatadir)
> dist_script_DATA = config.guess config.sub install-sh mdate-sh missing \
>   mkinstalldirs elisp-comp ylwrap acinstall depcomp compile py-compile \
>   symlink-tree
> 
> install-data-hook:
>         @$(POST_INSTALL)
>         @for prog in $(dist_script_DATA); do \
>           echo " chmod +x $(DESTDIR)$(scriptdir)/$$prog"; \
>           chmod +x $(DESTDIR)$(scriptdir)/$$prog; \
>         done
> 
> [...]

Scott
-- 
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

diff -ruNp libtool-CVS~/ChangeLog libtool-CVS/ChangeLog
--- libtool-CVS~/ChangeLog      2004-01-31 15:18:15.000000000 +0000
+++ libtool-CVS/ChangeLog       2004-02-03 21:12:03.000000000 +0000
@@ -0,0 +1,9 @@
+2004-02-03  Scott James Remnant  <address@hidden>
+
+       * Makefile.am (install-data-hook): Manually make config.guess
+       and config.sub executable after they are installed as _DATA.
+       We can't use _SCRIPTS because the various program name
+       transforms may be applied to them.
+       (dist_pkgdata_DATA): List config.guess and config.sub here
+       (pkgdata_SCRIPTS): instead of here.
+
diff -ruNp libtool-CVS~/Makefile.am libtool-CVS/Makefile.am
--- libtool-CVS~/Makefile.am    2004-01-27 12:38:16.000000000 +0000
+++ libtool-CVS/Makefile.am     2004-02-03 21:09:04.000000000 +0000
@@ -28,9 +28,10 @@ EXTRA_DIST = bootstrap libtoolize.in ltm
        ChangeLog.2000 ChangeLog.2001 ChangeLog.2002 ChangeLog.2003
 CLEANFILES = libtool libtoolize ltmain.shT
 
-# These are required by libtoolize.
-pkgdata_SCRIPTS = config/config.guess config/config.sub
-pkgdata_DATA = config/ltmain.sh
+# These are required by libtoolize and must be executable when installed.
+# Since _SCRIPTS gets the program transform applied we make them
+# executable by hand
+dist_pkgdata_DATA = config/config.guess config/config.sub config/ltmain.sh
 
 # Me maintain our own macros to provent problems with ancient definitions.
 # lt~obsolete.m4 doesn't belong here, it's for bootstrapping us only
@@ -81,6 +82,10 @@ install-data-local:
        -rm -rf $(DESTDIR)$(aclocaldir)/ltdl.m4
        -rm -rf $(DESTDIR)$(aclocaldir)/libtool.m4
 
+install-data-hook:
+       chmod +x $(DESTDIR)$(pkgdatadir)/config.guess
+       chmod +x $(DESTDIR)$(pkgdatadir)/config.sub
+
 
 ## ---------------------------------------------------------------- ##
 ##  Everything past here is useful to the maintainer, but probably  ##

signature.asc
Description: This is a digitally signed message part