git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR bootstrap/27818 (libjava installs libltdl sources in $prefix/share/libtool) 

PR gcc/27818:
	* Makefile.in: Rebuilt.
	* Makefile.am (install-data-local): Define conditionally.

From-SVN: r114389
This commit is contained in:
Tom Tromey 2006-06-05 15:08:56 +00:00 committed by Tom Tromey
parent a8b2849215
commit 3118f0d551
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libjava/libltdl/ChangeLog
View File

@ -1,3 +1,9 @@
2006-06-05 Tom Tromey <tromey@redhat.com>
PR gcc/27818:
* Makefile.in: Rebuilt.
* Makefile.am (install-data-local): Define conditionally.
2006-04-08 Andreas Tobler <a.tobler@schweiz.ch> 2006-04-08 Andreas Tobler <a.tobler@schweiz.ch>
* configure: Rebuilt. * configure: Rebuilt.

3
libjava/libltdl/Makefile.am
View File

@ -42,6 +42,8 @@ ltdldatafiles = COPYING.LIB README acinclude.m4 aclocal.m4 \
install-sh missing ltmain.sh \ install-sh missing ltmain.sh \
ltdl.c ltdl.h ltdl.c ltdl.h
## GCJ LOCAL: fix install buglet. See PR 27818
if INSTALL_LTDL
## To avoid spurious reconfiguration when the user installs these files ## To avoid spurious reconfiguration when the user installs these files
## with libtoolize, we have to preserve their timestamps carefully: ## with libtoolize, we have to preserve their timestamps carefully:
install-data-local: install-data-local:
@ -49,3 +51,4 @@ install-data-local:
$(mkinstalldirs) $(DESTDIR)$(ltdldatadir) $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \ ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
| ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
endif

11
libjava/libltdl/Makefile.in
View File

@ -577,6 +577,7 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@INSTALL_LTDL_FALSE@install-data-local:
clean: clean-am clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
@ -654,11 +655,11 @@ $(libltdl_la_OBJECTS) $(libltdlc_la_OBJECTS): libtool
libtool: $(LIBTOOL_DEPS) libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
install-data-local: @INSTALL_LTDL_TRUE@install-data-local:
-rm -rf $(DESTDIR)$(ltdldatadir) @INSTALL_LTDL_TRUE@ -rm -rf $(DESTDIR)$(ltdldatadir)
$(mkinstalldirs) $(DESTDIR)$(ltdldatadir) @INSTALL_LTDL_TRUE@ $(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \ @INSTALL_LTDL_TRUE@ ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
| ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) @INSTALL_LTDL_TRUE@ | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT: