maint: fix prefix and suffix installs for libtoolize.

* Makefile.am (install-data-local): Depend on new
install-scripts-local, and move libtoolize install from here...
(install-scripts-local): ...to here.
Pass libtoolize destination through program transform expression.
(uninstall-hook): Likewise, prior to removal.
* NEWS: Update.
* THANKS: Update.
Reported by Václav Zeman

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/Makefile.am b/Makefile.am
index 77561e15f3611facc193490d9f217012bcfbd745..cd7d61c27278a05d8ba8eccb1ce0189021241e8f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -476,7 +476,7 @@ pkgltdl_files       = COPYING.LIB \
                  ltdl.mk \
                  slist.c
 
-install-data-local: $(lt_Makefile_in)
+install-data-local: $(lt_Makefile_in) install-scripts-local
        @$(NORMAL_INSTALL)
 ## Don't install over the top of an old pkgdatadir
        -rm -rf '$(DESTDIR)$(pkgdatadir)'/*
@@ -508,9 +508,14 @@ install-data-local: $(lt_Makefile_in)
          echo " $(INSTALL_DATA) '$(ltdldir)/$$p' '$(DESTDIR)$(pkgdatadir)/$$p'"; \
          $(INSTALL_DATA) "$(ltdldir)/$$p" "$(DESTDIR)$(pkgdatadir)/$$p"; \
        done
+       chmod a+x '$(DESTDIR)$(pkgdatadir)/configure'
+
+install-scripts-local: $(lt_Makefile_in)
 ## Inline helper-scripts for installed libtoolize script
-       $(SCRIPT_ENV) '$(inline_source)' libtoolize > '$(DESTDIR)$(bindir)/libtoolize';
-       -chmod a+x '$(DESTDIR)$(pkgdatadir)/configure' '$(DESTDIR)$(bindir)/libtoolize'
+       @p=`echo libtoolize |sed -e '$(transform)'`; \
+       echo " $(SCRIPT_ENV) '$(inline_source)' libtoolize > '$(DESTDIR)$(bindir)/$$p'"; \
+       $(SCRIPT_ENV) '$(inline_source)' libtoolize > "$(DESTDIR)$(bindir)/$$p"; \
+       chmod a+x "$(DESTDIR)$(bindir)/$$p"
 
 
 ## ------------- ##
@@ -592,8 +597,9 @@ uninstall-hook:
          echo " rm -f '$(DESTDIR)$(aclocaldir)/$$f'"; \
          rm -f "$(DESTDIR)$(aclocaldir)/$$f"; \
        done
-       @echo " rm -f '$(DESTDIR)$(bindir)/libtoolize'"; \
-       rm -f '$(DESTDIR)$(bindir)/libtoolize'
+       @p=`echo libtoolize |sed -e '$(transform)'`; \
+       echo " rm -f '$(DESTDIR)$(bindir)/$$p'"; \
+       rm -f "$(DESTDIR)$(bindir)/$$p"
 
 
 ## ----------- ##

diff --git a/NEWS b/NEWS
index 6740ce639f7d378b3506d18510f5da64361acf67..635aef4d89720b81c0189bc07bd37a9ada37ac5b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,11 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Bug fixes:
+
+  - Installation of 'libtoolize' once again obeys '--program-prefix',
+    '--program-suffix' and '--program-transform-name' configure options.
+
 
 * Noteworthy changes in release 2.4.3 (2014-10-27) [stable]
 

diff --git a/THANKS b/THANKS
index 671f7c16942ef9b0a2bdfd312e49f8629b3c20d7..9603adcb1539ade990a10101d12b2950afeca201 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -204,6 +204,7 @@
   Tor Lillqvist                        tml@iki.fi
   Ulrich Drepper               drepper@ipd.info.uni-karlsruhe.de
   Warren Dodge                 warren.l.dodge@Tektronix.com
+  Václav Zeman                        vhaisman@gmail.com
   Vadim Zeitlin                        vz-libtool@zeitlins.org
   Vincent Lefevre              vincent@vinc17.org
   Vincent Torri                        vtorri@univ-evry.fr