[RFA:] SUN make VPATH breakage at libsupc++ header installation, take 2

Hans-Peter Nilsson hans-peter.nilsson@axis.com
Sun Jun 3 02:46:00 GMT 2001


Similar to <URL: http://gcc.gnu.org/ml/gcc-patches/2001-06/msg00003.html >,
though not using basename.  For the automake people, it seems it
would handle headers with paths too for the non-nobase case, if
you want to use this as a special-case expansion.

Bootstrapped and checked on trunk and branch, sparc-sun-solaris2.8 with
and without GNU make, and on i686-pc-linux-gnu, no new failures.

Ok to commit, head and branch?

	* libsupc++/Makefile.am (install-glibcppinstallHEADERS,
	uninstall-glibcppinstallHEADERS): Have explicit rules catering to
	SUN make VPATH peculiarities.
	* libsupc++/Makefile.in: Regenerate.

Index: libstdc++-v3/libsupc++/Makefile.am
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/libsupc++/Makefile.am,v
retrieving revision 1.19.2.6
diff -p -c -r1.19.2.6 Makefile.am
*** libstdc++-v3/libsupc++/Makefile.am	2001/05/14 19:49:11	1.19.2.6
--- libstdc++-v3/libsupc++/Makefile.am	2001/06/01 23:16:16
*************** LTCXXCOMPILE = $(LIBTOOL) --tag CXX --ta
*** 148,150 ****
--- 148,169 ----
  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

brgds, H-P



More information about the Libstdc++ mailing list