From 6c924cf21caae1d6f277d281eb276b2bab2ef4ba Mon Sep 17 00:00:00 2001 From: Vladimir Mezentsev Date: Thu, 17 Mar 2022 09:57:28 -0700 Subject: [PATCH] Install gprofng libraries under $(pkglibdir) gprofng/ChangeLog 2022-03-21 Vladimir Mezentsev PR gprofng/28972 * gprofng/libcollector/Makefile.am: Rename lib_LTLIBRARIES to pkglib_LTLIBRARIES. Add install-data-local. * gprofng/src/Makefile.am: Likewise. * gprofng/src/envsets.cc (putenv_libcollector_ld_misc): New location of the gprofng libraries. * gprofng/configure.ac: Removed an unused GPROFNG_LIBDIR. * gprofng/Makefile.am: Removed an unused GPROFNG_LIBDIR. Add install-data-local. * gprofng/configure: Regenerate. * gprofng/Makefile.in: Likewise. * gprofng/doc/Makefile.in: Likewise. * gprofng/gp-display-htmllibcollector/Makefile.in: Likewise. * gprofng/libcollector/Makefile.in: Likewise. * gprofng/src/Makefile.in: Likewise. --- gprofng/Makefile.am | 4 +- gprofng/Makefile.in | 4 +- gprofng/configure | 7 +-- gprofng/configure.ac | 1 - gprofng/doc/Makefile.in | 2 +- gprofng/gp-display-html/Makefile.in | 2 +- gprofng/libcollector/Makefile.am | 6 +- gprofng/libcollector/Makefile.in | 91 ++++++++++++++++------------- gprofng/src/Makefile.am | 6 +- gprofng/src/Makefile.in | 78 +++++++++++++------------ gprofng/src/envsets.cc | 6 +- 11 files changed, 109 insertions(+), 98 deletions(-) diff --git a/gprofng/Makefile.am b/gprofng/Makefile.am index e06769cbf90..2fcd695140c 100644 --- a/gprofng/Makefile.am +++ b/gprofng/Makefile.am @@ -40,15 +40,13 @@ jdk_inc = @jdk_inc@ LD_NO_AS_NEEDED = @LD_NO_AS_NEEDED@ GPROFNG_CFLAGS = @GPROFNG_CFLAGS@ GPROFNG_CPPFLAGS = @GPROFNG_CPPFLAGS@ -GPROFNG_LIBDIR = @GPROFNG_LIBDIR@ GPROFNG_BROKEN_JAVAC = @GPROFNG_BROKEN_JAVAC@ AM_MAKEFLAGS = \ jdk_inc="$(jdk_inc)" \ LD_NO_AS_NEEDED="$(LD_NO_AS_NEEDED)" \ GPROFNG_CFLAGS="$(GPROFNG_CFLAGS)" \ - GPROFNG_CPPFLAGS="$(GPROFNG_CPPFLAGS)" \ - GPROFNG_LIBDIR="$(GPROFNG_LIBDIR)" + GPROFNG_CPPFLAGS="$(GPROFNG_CPPFLAGS)" if TCL_TRY check-DEJAGNU: site.exp development.exp diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in index c7e3780d2b9..3c41d247590 100644 --- a/gprofng/Makefile.in +++ b/gprofng/Makefile.in @@ -267,7 +267,6 @@ GPROFNG_BROKEN_JAVAC = @GPROFNG_BROKEN_JAVAC@ GPROFNG_CFLAGS = @GPROFNG_CFLAGS@ GPROFNG_CPPFLAGS = @GPROFNG_CPPFLAGS@ GPROFNG_LIBADD = @GPROFNG_LIBADD@ -GPROFNG_LIBDIR = @GPROFNG_LIBDIR@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS = @GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS@ GPROFNG_NO_SWITCH_CFLAGS = @GPROFNG_NO_SWITCH_CFLAGS@ GREP = @GREP@ @@ -390,8 +389,7 @@ AM_MAKEFLAGS = \ jdk_inc="$(jdk_inc)" \ LD_NO_AS_NEEDED="$(LD_NO_AS_NEEDED)" \ GPROFNG_CFLAGS="$(GPROFNG_CFLAGS)" \ - GPROFNG_CPPFLAGS="$(GPROFNG_CPPFLAGS)" \ - GPROFNG_LIBDIR="$(GPROFNG_LIBDIR)" + GPROFNG_CPPFLAGS="$(GPROFNG_CPPFLAGS)" # development.sh is used to determine -Werror default. diff --git a/gprofng/configure b/gprofng/configure index bd52fd940fd..3064bd74733 100755 --- a/gprofng/configure +++ b/gprofng/configure @@ -635,7 +635,6 @@ LTLIBOBJS LIBOBJS BUILD_SUBDIRS CLOCK_GETTIME_LINK -GPROFNG_LIBDIR GPROFNG_CPPFLAGS GPROFNG_CFLAGS LD_NO_AS_NEEDED @@ -12137,7 +12136,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12140 "configure" +#line 12139 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12243,7 +12242,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12246 "configure" +#line 12245 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16695,8 +16694,6 @@ GPROFNG_CFLAGS=${gprofng_cflags} GPROFNG_CPPFLAGS=${gprofng_cppflags} -GPROFNG_LIBDIR=${libdir} - ac_fn_c_check_decl "$LINENO" "basename" "ac_cv_have_decl_basename" "$ac_includes_default" if test "x$ac_cv_have_decl_basename" = xyes; then : diff --git a/gprofng/configure.ac b/gprofng/configure.ac index a4da4e0f6f8..95bffe0e4e2 100644 --- a/gprofng/configure.ac +++ b/gprofng/configure.ac @@ -197,7 +197,6 @@ AC_SUBST(GPROFNG_CFLAGS, [${gprofng_cflags}]) AC_SUBST(GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS) AC_SUBST(GPROFNG_NO_SWITCH_CFLAGS) AC_SUBST(GPROFNG_CPPFLAGS, [${gprofng_cppflags}]) -AC_SUBST(GPROFNG_LIBDIR, [${libdir}]) AC_CHECK_DECLS([basename]) AC_CHECK_FUNCS(clock_gettime strsignal) diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in index 6f41ef755e1..7eb552b2a6d 100644 --- a/gprofng/doc/Makefile.in +++ b/gprofng/doc/Makefile.in @@ -245,10 +245,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPECT = @EXPECT@ FGREP = @FGREP@ +GPROFNG_BROKEN_JAVAC = @GPROFNG_BROKEN_JAVAC@ GPROFNG_CFLAGS = @GPROFNG_CFLAGS@ GPROFNG_CPPFLAGS = @GPROFNG_CPPFLAGS@ GPROFNG_LIBADD = @GPROFNG_LIBADD@ -GPROFNG_LIBDIR = @GPROFNG_LIBDIR@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS = @GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS@ GPROFNG_NO_SWITCH_CFLAGS = @GPROFNG_NO_SWITCH_CFLAGS@ GREP = @GREP@ diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in index d8037cac2c1..e0df2d73be8 100644 --- a/gprofng/gp-display-html/Makefile.in +++ b/gprofng/gp-display-html/Makefile.in @@ -209,10 +209,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPECT = @EXPECT@ FGREP = @FGREP@ +GPROFNG_BROKEN_JAVAC = @GPROFNG_BROKEN_JAVAC@ GPROFNG_CFLAGS = @GPROFNG_CFLAGS@ GPROFNG_CPPFLAGS = @GPROFNG_CPPFLAGS@ GPROFNG_LIBADD = @GPROFNG_LIBADD@ -GPROFNG_LIBDIR = @GPROFNG_LIBDIR@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS = @GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS@ GPROFNG_NO_SWITCH_CFLAGS = @GPROFNG_NO_SWITCH_CFLAGS@ GREP = @GREP@ diff --git a/gprofng/libcollector/Makefile.am b/gprofng/libcollector/Makefile.am index 901d9a5f0ee..ffb4f977aa5 100644 --- a/gprofng/libcollector/Makefile.am +++ b/gprofng/libcollector/Makefile.am @@ -54,7 +54,7 @@ myinclude_HEADERS = $(srcdir)/../../include/collectorAPI.h \ $(srcdir)/../../include/libcollector.h \ $(srcdir)/../../include/libfcollector.h -lib_LTLIBRARIES = libgp-collector.la libgp-collectorAPI.la libgp-heap.la \ +pkglib_LTLIBRARIES = libgp-collector.la libgp-collectorAPI.la libgp-heap.la \ libgp-sync.la libgp-iotrace.la libgp_collector_la_SOURCES = $(CSOURCES) @@ -77,3 +77,7 @@ libgp_iotrace_la_LDFLAGS = $(AM_LDFLAGS) libgp_collectorAPI_la_SOURCES = collectorAPI.c libgp_collectorAPI_la_LIBADD = -lc -ldl +.PHONY: install-data-local + +install-data-local: install-pkglibLTLIBRARIES + rm -f $(DESTDIR)/$(pkglibdir)/*.la $(DESTDIR)/$(pkglibdir)/*.a diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in index e871294fe74..b554b665c66 100644 --- a/gprofng/libcollector/Makefile.in +++ b/gprofng/libcollector/Makefile.in @@ -156,8 +156,8 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(myincludedir)" -LTLIBRARIES = $(lib_LTLIBRARIES) +am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(myincludedir)" +LTLIBRARIES = $(pkglib_LTLIBRARIES) libgp_collector_la_DEPENDENCIES = am__objects_1 = libgp_collector_la-gethrtime.lo \ libgp_collector_la-dispatcher.lo libgp_collector_la-iolib.lo \ @@ -456,7 +456,7 @@ myinclude_HEADERS = $(srcdir)/../../include/collectorAPI.h \ $(srcdir)/../../include/libcollector.h \ $(srcdir)/../../include/libfcollector.h -lib_LTLIBRARIES = libgp-collector.la libgp-collectorAPI.la libgp-heap.la \ +pkglib_LTLIBRARIES = libgp-collector.la libgp-collectorAPI.la libgp-heap.la \ libgp-sync.la libgp-iotrace.la libgp_collector_la_SOURCES = $(CSOURCES) @@ -529,33 +529,33 @@ $(top_srcdir)/../common/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps distclean-hdr: -rm -f lib-config.h stamp-h1 -install-libLTLIBRARIES: $(lib_LTLIBRARIES) +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ list2="$$list2 $$p"; \ else :; fi; \ done; \ test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } -uninstall-libLTLIBRARIES: +uninstall-pkglibLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ for p in $$list; do \ $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ locs=`for p in $$list; do echo $$p; done | \ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ sort -u`; \ @@ -565,19 +565,19 @@ clean-libLTLIBRARIES: } libgp-collector.la: $(libgp_collector_la_OBJECTS) $(libgp_collector_la_DEPENDENCIES) $(EXTRA_libgp_collector_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgp_collector_la_LINK) -rpath $(libdir) $(libgp_collector_la_OBJECTS) $(libgp_collector_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libgp_collector_la_LINK) -rpath $(pkglibdir) $(libgp_collector_la_OBJECTS) $(libgp_collector_la_LIBADD) $(LIBS) libgp-collectorAPI.la: $(libgp_collectorAPI_la_OBJECTS) $(libgp_collectorAPI_la_DEPENDENCIES) $(EXTRA_libgp_collectorAPI_la_DEPENDENCIES) - $(AM_V_CCLD)$(LINK) -rpath $(libdir) $(libgp_collectorAPI_la_OBJECTS) $(libgp_collectorAPI_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(LINK) -rpath $(pkglibdir) $(libgp_collectorAPI_la_OBJECTS) $(libgp_collectorAPI_la_LIBADD) $(LIBS) libgp-heap.la: $(libgp_heap_la_OBJECTS) $(libgp_heap_la_DEPENDENCIES) $(EXTRA_libgp_heap_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgp_heap_la_LINK) -rpath $(libdir) $(libgp_heap_la_OBJECTS) $(libgp_heap_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libgp_heap_la_LINK) -rpath $(pkglibdir) $(libgp_heap_la_OBJECTS) $(libgp_heap_la_LIBADD) $(LIBS) libgp-iotrace.la: $(libgp_iotrace_la_OBJECTS) $(libgp_iotrace_la_DEPENDENCIES) $(EXTRA_libgp_iotrace_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgp_iotrace_la_LINK) -rpath $(libdir) $(libgp_iotrace_la_OBJECTS) $(libgp_iotrace_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libgp_iotrace_la_LINK) -rpath $(pkglibdir) $(libgp_iotrace_la_OBJECTS) $(libgp_iotrace_la_LIBADD) $(LIBS) libgp-sync.la: $(libgp_sync_la_OBJECTS) $(libgp_sync_la_DEPENDENCIES) $(EXTRA_libgp_sync_la_DEPENDENCIES) - $(AM_V_CCLD)$(libgp_sync_la_LINK) -rpath $(libdir) $(libgp_sync_la_OBJECTS) $(libgp_sync_la_LIBADD) $(LIBS) + $(AM_V_CCLD)$(libgp_sync_la_LINK) -rpath $(pkglibdir) $(libgp_sync_la_OBJECTS) $(libgp_sync_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1003,7 +1003,7 @@ check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(HEADERS) lib-config.h installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(myincludedir)"; do \ + for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(myincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1038,7 +1038,7 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \ +clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ mostlyclean-am distclean: distclean-am @@ -1060,13 +1060,13 @@ info: info-am info-am: -install-data-am: install-myincludeHEADERS +install-data-am: install-data-local install-myincludeHEADERS install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-libLTLIBRARIES +install-exec-am: install-pkglibLTLIBRARIES install-html: install-html-am @@ -1108,31 +1108,38 @@ ps: ps-am ps-am: -uninstall-am: uninstall-libLTLIBRARIES uninstall-myincludeHEADERS +uninstall-am: uninstall-myincludeHEADERS uninstall-pkglibLTLIBRARIES .MAKE: all install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am am--refresh check check-am clean \ - clean-cscope clean-generic clean-libLTLIBRARIES clean-libtool \ - cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ - dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ - distcheck distclean distclean-compile distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck 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-info install-info-am \ - install-libLTLIBRARIES install-man install-myincludeHEADERS \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-libLTLIBRARIES uninstall-myincludeHEADERS + clean-cscope clean-generic clean-libtool \ + clean-pkglibLTLIBRARIES cscope cscopelist-am ctags ctags-am \ + dist dist-all dist-bzip2 dist-gzip dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-compile distclean-generic distclean-hdr \ + distclean-libtool distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-local install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-myincludeHEADERS \ + install-pdf install-pdf-am install-pkglibLTLIBRARIES \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am uninstall-myincludeHEADERS \ + uninstall-pkglibLTLIBRARIES .PRECIOUS: Makefile +.PHONY: install-data-local + +install-data-local: install-pkglibLTLIBRARIES + rm -f $(DESTDIR)/$(pkglibdir)/*.la $(DESTDIR)/$(pkglibdir)/*.a + # 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: diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index fdd95f5f7ba..4c5a836b3fd 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -118,7 +118,7 @@ MAINTAINERCLEANFILES = $(man_MANS) EXTRA_DIST = $(man_MANS) -lib_LTLIBRARIES = $(LIBGPROFNG) +pkglib_LTLIBRARIES = $(LIBGPROFNG) libgprofng_la_SOURCES = $(CCSOURCES) $(CSOURCES) libgprofng_la_LDFLAGS = -version-info 0:0:0 libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \ @@ -201,3 +201,7 @@ endif # so ensure that the necessary libraries are built at dist time. dist-hook: $(LIBGPROFNG) +.PHONY: install-data-local + +install-data-local: install-pkglibLTLIBRARIES + rm -f $(DESTDIR)/$(pkglibdir)/*.la $(DESTDIR)/$(pkglibdir)/*.a diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index 3659ca09ee0..0cdc3b9477b 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -155,9 +155,9 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ +am__installdirs = "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)" -LTLIBRARIES = $(lib_LTLIBRARIES) +LTLIBRARIES = $(pkglib_LTLIBRARIES) am__DEPENDENCIES_1 = libgprofng_la_DEPENDENCIES = $(top_builddir)/../opcodes/libopcodes.la \ $(top_builddir)/../bfd/libbfd.la $(am__DEPENDENCIES_1) \ @@ -328,10 +328,10 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPECT = @EXPECT@ FGREP = @FGREP@ +GPROFNG_BROKEN_JAVAC = @GPROFNG_BROKEN_JAVAC@ GPROFNG_CFLAGS = @GPROFNG_CFLAGS@ GPROFNG_CPPFLAGS = @GPROFNG_CPPFLAGS@ GPROFNG_LIBADD = @GPROFNG_LIBADD@ -GPROFNG_LIBDIR = @GPROFNG_LIBDIR@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS = @GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS@ GPROFNG_NO_SWITCH_CFLAGS = @GPROFNG_NO_SWITCH_CFLAGS@ GREP = @GREP@ @@ -538,7 +538,7 @@ man_MANS = gprofng.1 \ MAINTAINERCLEANFILES = $(man_MANS) EXTRA_DIST = $(man_MANS) -lib_LTLIBRARIES = $(LIBGPROFNG) +pkglib_LTLIBRARIES = $(LIBGPROFNG) libgprofng_la_SOURCES = $(CCSOURCES) $(CSOURCES) libgprofng_la_LDFLAGS = -version-info 0:0:0 libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \ @@ -614,33 +614,33 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-libLTLIBRARIES: $(lib_LTLIBRARIES) +install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) @$(NORMAL_INSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ list2="$$list2 $$p"; \ else :; fi; \ done; \ test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ } -uninstall-libLTLIBRARIES: +uninstall-pkglibLTLIBRARIES: @$(NORMAL_UNINSTALL) - @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ + @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ for p in $$list; do \ $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ done -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; \ +clean-pkglibLTLIBRARIES: + -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) + @list='$(pkglib_LTLIBRARIES)'; \ locs=`for p in $$list; do echo $$p; done | \ sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ sort -u`; \ @@ -650,7 +650,7 @@ clean-libLTLIBRARIES: } libgprofng.la: $(libgprofng_la_OBJECTS) $(libgprofng_la_DEPENDENCIES) $(EXTRA_libgprofng_la_DEPENDENCIES) - $(AM_V_CXXLD)$(libgprofng_la_LINK) -rpath $(libdir) $(libgprofng_la_OBJECTS) $(libgprofng_la_LIBADD) $(LIBS) + $(AM_V_CXXLD)$(libgprofng_la_LINK) -rpath $(pkglibdir) $(libgprofng_la_OBJECTS) $(libgprofng_la_LIBADD) $(LIBS) install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ @@ -1016,10 +1016,8 @@ distdir: $(DISTFILES) check-am: all-am check: check-am all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) -install-binPROGRAMS: install-libLTLIBRARIES - installdirs: - for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)"; do \ + for dir in "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1055,8 +1053,8 @@ maintainer-clean-generic: -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) clean: clean-am -clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ - clean-libtool mostlyclean-am +clean-am: clean-binPROGRAMS clean-generic clean-libtool \ + clean-pkglibLTLIBRARIES mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1076,13 +1074,13 @@ info: info-am info-am: -install-data-am: install-dbeDATA install-man +install-data-am: install-data-local install-dbeDATA install-man install-dvi: install-dvi-am install-dvi-am: -install-exec-am: install-binPROGRAMS install-libLTLIBRARIES +install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES install-html: install-html-am @@ -1122,29 +1120,30 @@ ps: ps-am ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-dbeDATA \ - uninstall-libLTLIBRARIES uninstall-man +uninstall-am: uninstall-binPROGRAMS uninstall-dbeDATA uninstall-man \ + uninstall-pkglibLTLIBRARIES uninstall-man: uninstall-man1 .MAKE: install-am install-strip .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ - clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \ - clean-libtool cscopelist-am ctags ctags-am dist-hook distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-data \ - install-data-am install-dbeDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-man install-man1 install-pdf install-pdf-am install-ps \ + clean-binPROGRAMS clean-generic clean-libtool \ + clean-pkglibLTLIBRARIES cscopelist-am ctags ctags-am dist-hook \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-data-local \ + install-dbeDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-man1 install-pdf \ + install-pdf-am install-pkglibLTLIBRARIES install-ps \ install-ps-am install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-dbeDATA \ - uninstall-libLTLIBRARIES uninstall-man uninstall-man1 + uninstall-man uninstall-man1 uninstall-pkglibLTLIBRARIES .PRECIOUS: Makefile @@ -1175,6 +1174,11 @@ uninstall-man: uninstall-man1 # so ensure that the necessary libraries are built at dist time. dist-hook: $(LIBGPROFNG) +.PHONY: install-data-local + +install-data-local: install-pkglibLTLIBRARIES + rm -f $(DESTDIR)/$(pkglibdir)/*.la $(DESTDIR)/$(pkglibdir)/*.a + # 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: diff --git a/gprofng/src/envsets.cc b/gprofng/src/envsets.cc index de06fbf3678..484cbf83995 100644 --- a/gprofng/src/envsets.cc +++ b/gprofng/src/envsets.cc @@ -167,7 +167,7 @@ collect::putenv_libcollector_ld_misc () char *fname; if (*s == '/') { - fname = dbe_sprintf ("%s/%s", s, LIBGP_COLLECTOR); + fname = dbe_sprintf ("%s/%s/%s", s, PACKAGE, LIBGP_COLLECTOR); if (access (fname, R_OK | F_OK) == 0) { if (++cnt != 1) @@ -177,12 +177,12 @@ collect::putenv_libcollector_ld_misc () } else { - fname = dbe_sprintf ("%s/%s/%s", run_dir, s, LIBGP_COLLECTOR); + fname = dbe_sprintf ("%s/%s/%s/%s", run_dir, s, PACKAGE, LIBGP_COLLECTOR); if (access (fname, R_OK | F_OK) == 0) { if (++cnt != 1) sb.append (':'); - sb.appendf ("%s/%s", run_dir, s); + sb.appendf ("%s/%s/%s", run_dir, s, PACKAGE); } } free (fname); -- 2.35.1