re PR fortran/46594 (libquadmath intrudes generic (file system) namespace)

2010-11-30  Tobias Burnus  <burnus@net-b.de>

        PR fortran/46594
        * Makefile.am: Install include files in
        target/version specific directory.
        * Makefile.in: Regenerate.

From-SVN: r167295

diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index eeba455a3402d408451d8f6ca4a8b814d2609bcc..ee08c78644c876c3c069966e6f9e7491606ad195 100644 (file)
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,10 @@
+2010-11-30  Tobias Burnus  <burnus@net-b.de>
+
+       PR fortran/46594
+       * Makefile.am: Install include files in
+       target/version specific directory.
+       * Makefile.in: Regenerate.
+
 2010-11-30  Tobias Burnus  <burnus@net-b.de>
 
        * acinclude.m4 (LIBGOMP_CHECK_SYNC_BUILTINS,

diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am
index ef876431d3ded232d5071b302c4017c22e9520d2..899051b94fa77cc60171cdbdd9fe709f3b55fbc1 100644 (file)
--- a/libquadmath/Makefile.am
+++ b/libquadmath/Makefile.am
@@ -39,7 +39,8 @@ libquadmath_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
                         $(version_arg) -no-undefined -bindir "$(bindir)" -lm
 libquadmath_la_DEPENDENCIES = $(version_dep) $(libquadmath_la_LIBADD)
 
-include_HEADERS = quadmath.h quadmath_weak.h
+nodist_libsubinclude_HEADERS = quadmath.h quadmath_weak.h
+libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 
 libquadmath_la_SOURCES = \
   gdtoa/arith.h gdtoa/gdtoa_fltrnds.h gdtoa/gd_qnan.h gdtoa/gdtoaimp.h \

diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 42f717dec26bf53491081f01968ec1faf6b4f21e..69a0586c3b2484502b20103d7b7dffe0f873b2de 100644 (file)
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -41,17 +41,18 @@ subdir = .
 DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
        $(top_srcdir)/configure $(am__configure_deps) \
        $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \
-       $(srcdir)/../depcomp $(am__include_HEADERS_DIST)
+       $(srcdir)/../depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/../ltoptions.m4 \
-       $(top_srcdir)/../ltsugar.m4 $(top_srcdir)/../ltversion.m4 \
-       $(top_srcdir)/../lt~obsolete.m4 $(top_srcdir)/../config/acx.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../config/depstand.m4 \
        $(top_srcdir)/../config/lead-dot.m4 \
        $(top_srcdir)/../config/multi.m4 \
        $(top_srcdir)/../config/no-executables.m4 \
-       $(top_srcdir)/../config/override.m4 $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac
+       $(top_srcdir)/../config/override.m4 \
+       $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
+       $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
+       $(top_srcdir)/acinclude.m4 $(top_srcdir)/../libtool.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -82,7 +83,7 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(toolexeclibdir)" \
-       "$(DESTDIR)$(includedir)"
+       "$(DESTDIR)$(libsubincludedir)"
 LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
 am__dirstamp = $(am__leading_dot)dirstamp
 @BUILD_LIBQUADMATH_TRUE@am_libquadmath_la_OBJECTS = gdtoa/dmisc.lo \
@@ -148,8 +149,7 @@ MULTIDIRS =
 MULTISUBDIR = 
 MULTIDO = true
 MULTICLEAN = true
-am__include_HEADERS_DIST = quadmath.h quadmath_weak.h
-HEADERS = $(include_HEADERS)
+HEADERS = $(nodist_libsubinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
 ACLOCAL = @ACLOCAL@
@@ -288,7 +288,8 @@ AUTOMAKE_OPTIONS = 1.8 foreign
 @BUILD_LIBQUADMATH_TRUE@                        $(version_arg) -no-undefined -bindir "$(bindir)" -lm
 
 @BUILD_LIBQUADMATH_TRUE@libquadmath_la_DEPENDENCIES = $(version_dep) $(libquadmath_la_LIBADD)
-@BUILD_LIBQUADMATH_TRUE@include_HEADERS = quadmath.h quadmath_weak.h
+@BUILD_LIBQUADMATH_TRUE@nodist_libsubinclude_HEADERS = quadmath.h quadmath_weak.h
+@BUILD_LIBQUADMATH_TRUE@libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 @BUILD_LIBQUADMATH_TRUE@libquadmath_la_SOURCES = \
 @BUILD_LIBQUADMATH_TRUE@  gdtoa/arith.h gdtoa/gdtoa_fltrnds.h gdtoa/gd_qnan.h gdtoa/gdtoaimp.h \
 @BUILD_LIBQUADMATH_TRUE@  gdtoa/gdtoa.h quadmath-imp.h \
@@ -806,26 +807,26 @@ distclean-multi:
        $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean # $(MAKE)
 maintainer-clean-multi:
        $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean # $(MAKE)
-install-includeHEADERS: $(include_HEADERS)
+install-nodist_libsubincludeHEADERS: $(nodist_libsubinclude_HEADERS)
        @$(NORMAL_INSTALL)
-       test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
-       @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+       test -z "$(libsubincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libsubincludedir)"
+       @list='$(nodist_libsubinclude_HEADERS)'; test -n "$(libsubincludedir)" || list=; \
        for p in $$list; do \
          if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
          echo "$$d$$p"; \
        done | $(am__base_list) | \
        while read files; do \
-         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(includedir)'"; \
-         $(INSTALL_HEADER) $$files "$(DESTDIR)$(includedir)" || exit $$?; \
+         echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libsubincludedir)'"; \
+         $(INSTALL_HEADER) $$files "$(DESTDIR)$(libsubincludedir)" || exit $$?; \
        done
 
-uninstall-includeHEADERS:
+uninstall-nodist_libsubincludeHEADERS:
        @$(NORMAL_UNINSTALL)
-       @list='$(include_HEADERS)'; test -n "$(includedir)" || list=; \
+       @list='$(nodist_libsubinclude_HEADERS)'; test -n "$(libsubincludedir)" || list=; \
        files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
        test -n "$$files" || exit 0; \
-       echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \
-       cd "$(DESTDIR)$(includedir)" && rm -f $$files
+       echo " ( cd '$(DESTDIR)$(libsubincludedir)' && rm -f" $$files ")"; \
+       cd "$(DESTDIR)$(libsubincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -882,7 +883,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h
 installdirs:
-       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(includedir)"; do \
+       for dir in "$(DESTDIR)$(toolexeclibdir)" "$(DESTDIR)$(libsubincludedir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -938,7 +939,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-includeHEADERS
+install-data-am: install-nodist_libsubincludeHEADERS
 
 install-dvi: install-dvi-am
 
@@ -986,7 +987,7 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-includeHEADERS \
+uninstall-am: uninstall-nodist_libsubincludeHEADERS \
        uninstall-toolexeclibLTLIBRARIES
 
 .MAKE: all all-multi clean-multi distclean-multi install-am \
@@ -1000,15 +1001,15 @@ uninstall-am: uninstall-includeHEADERS \
        distclean-multi distclean-tags dvi dvi-am html html-am info \
        info-am install install-am install-data install-data-am \
        install-dvi install-dvi-am install-exec install-exec-am \
-       install-html install-html-am install-includeHEADERS \
-       install-info install-info-am install-man install-multi \
+       install-html install-html-am install-info install-info-am \
+       install-man install-multi install-nodist_libsubincludeHEADERS \
        install-pdf install-pdf-am install-ps install-ps-am \
        install-strip install-toolexeclibLTLIBRARIES installcheck \
        installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic maintainer-clean-multi mostlyclean \
        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
        mostlyclean-multi pdf pdf-am ps ps-am tags uninstall \
-       uninstall-am uninstall-includeHEADERS \
+       uninstall-am uninstall-nodist_libsubincludeHEADERS \
        uninstall-toolexeclibLTLIBRARIES
 
 @BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_SUN_TRUE@@LIBQUAD_USE_SYMVER_TRUE@quadmath.map-sun : $(srcdir)/quadmath.map \