From 9f1bfa5df66f48737c61866e80b251174a37282f Mon Sep 17 00:00:00 2001 From: hp Date: Mon, 4 Jun 2001 02:24:06 +0000 Subject: [PATCH] * libsupc++/Makefile.am (install-glibcppinstallHEADERS, uninstall-glibcppinstallHEADERS): Have explicit rules catering to SUN make VPATH peculiarities. * libsupc++/Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42844 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/libsupc++/Makefile.am | 19 +++++++++++++++++++ libstdc++-v3/libsupc++/Makefile.in | 34 +++++++++++++++++++--------------- 3 files changed, 45 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 13177fe..0fba2fe 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2001-06-04 Hans-Peter Nilsson + + * libsupc++/Makefile.am (install-glibcppinstallHEADERS, + uninstall-glibcppinstallHEADERS): Have explicit rules catering to + SUN make VPATH peculiarities. + * libsupc++/Makefile.in: Regenerate. + 2001-06-01 Hans-Peter Nilsson * src/Makefile.am (VPATH): Delimit with ":", not space. diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index c3d40ce..6c475ae 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -148,3 +148,22 @@ LTCXXCOMPILE = $(LIBTOOL) --tag CXX --tag disable-shared \ CXXLINK = $(LIBTOOL) --tag CXX --tag disable-shared \ --mode=link $(CXX) \ @OPT_LDFLAGS@ @SECTION_LDFLAGS@ $(AM_CXXFLAGS) $(LDFLAGS) -o $@ + +# We have to have rules modified from the default to counteract SUN make +# prepending each of $(glibcppinstall_HEADERS) with VPATH below. +install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir) + @list='$(glibcppinstall_HEADERS)'; for p in $$list; do \ + q=`echo $$p | sed -e 's,.*/,,'`; \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q; \ + done + +uninstall-glibcppinstallHEADERS: + @$(NORMAL_UNINSTALL) + list='$(glibcppinstall_HEADERS)'; for p in $$list; do \ + q=`echo $$p | sed -e 's,.*/,,'`; \ + rm -f $(DESTDIR)$(glibcppinstalldir)/$$q; \ + done diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 822a6ad..12b243c 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -343,21 +343,6 @@ libsupc++.la: $(libsupc___la_OBJECTS) $(libsupc___la_DEPENDENCIES) .cc.lo: $(LTCXXCOMPILE) -c $< -install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir) - @list='$(glibcppinstall_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$p; \ - done - -uninstall-glibcppinstallHEADERS: - @$(NORMAL_UNINSTALL) - list='$(glibcppinstall_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(glibcppinstalldir)/$$p; \ - done - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) @@ -490,6 +475,25 @@ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +# We have to have rules modified from the default to counteract SUN make +# prepending each of $(glibcppinstall_HEADERS) with VPATH below. +install-glibcppinstallHEADERS: $(glibcppinstall_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(glibcppinstalldir) + @list='$(glibcppinstall_HEADERS)'; for p in $$list; do \ + q=`echo $$p | sed -e 's,.*/,,'`; \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(glibcppinstalldir)/$$q; \ + done + +uninstall-glibcppinstallHEADERS: + @$(NORMAL_UNINSTALL) + list='$(glibcppinstall_HEADERS)'; for p in $$list; do \ + q=`echo $$p | sed -e 's,.*/,,'`; \ + rm -f $(DESTDIR)$(glibcppinstalldir)/$$q; \ + done + # 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. .NOEXPORT: -- 2.7.4