mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2024-11-21 01:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

maint: fix prefix and suffix installs for libtoolize.

Browse Source 
* 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>
This commit is contained in:
Gary V. Vaughan 2014-10-29 12:17:35 +00:00
parent a64ea4d8c4
commit c77eea5f6c
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -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"
## ----------- ##

5
NEWS
View File

@ -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]

1
THANKS
View File

@ -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