From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by sourceware.org (Postfix) with ESMTPS id 71F1C3858C74 for ; Sun, 20 Mar 2022 23:10:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 71F1C3858C74 Received: by mail-pl1-x633.google.com with SMTP id p17so11277693plo.9 for ; Sun, 20 Mar 2022 16:10:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=fWsABFn6mZljms619LhukdS7Ms7dfAmgpt/qUNYXltY=; b=6GNBlnPmPWEEl8rcwpr1V2H0WQy4Vv9ROsZ9CVaGRFAXgIZo0qZaKnbrMYy/GTQUdK osIPhTcC7CfcGieRb5TqGYLj26Yayx84of+yG1cfoteh54CWzTRf2PnJzFz6sFvUM2c2 lQhyTWcrrm2bn/Vyl24R3CvZuqva/Sc0f2cSPkxtby6NcWJb6mcw6AlPYXT7vqWmrvRa vqTH7iRGiumm+NMjLRb9J0pi9PLDK4pFggPNehCqY1uAznYg+s7Hr3dYRLrQtVsTYY/I tXGy+0WfWb1DcerbTk0Z8SVvSb84neUHib4yzFM6EFZz2WOmY/KdnY2OsKPSes47QXz9 A4lA== X-Gm-Message-State: AOAM530IA8TxyP/2+9uURTx1QQoNT8vovV3IGytkVahf4a1SC+y17rkf JjZTA43rjIIpIlsFTAPjQ7e2EOvBsQ7s7eG/FEU= X-Google-Smtp-Source: ABdhPJzVKZbZKpt5Dj7mc45+IWSzuPdc8P2Lt2DDofSeJwHpTEpDGxE0YnYAYZpvftvvbShaVAlTTwqFJboG84WJe/Y= X-Received: by 2002:a17:90a:db50:b0:1c6:99dd:c40d with SMTP id u16-20020a17090adb5000b001c699ddc40dmr18794215pjx.143.1647817809101; Sun, 20 Mar 2022 16:10:09 -0700 (PDT) MIME-Version: 1.0 References: <20220317170036.3748419-1-vladimir.mezentsev@oracle.com> In-Reply-To: <20220317170036.3748419-1-vladimir.mezentsev@oracle.com> From: "H.J. Lu" Date: Sun, 20 Mar 2022 16:09:33 -0700 Message-ID: Subject: Re: [PATCH] PR28972, gprofng libraries should be installed under $(pkglibdir) To: Vladimir Mezentsev Cc: Binutils Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-3026.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Mar 2022 23:10:16 -0000 On Thu, Mar 17, 2022 at 10:01 AM Vladimir Mezentsev via Binutils wrote: > > From: Vladimir Mezentsev > > gprofng/ChangeLog > 2022-03-17 Vladimir Mezentsev > Please add PR gprofng/28972 here so that https://sourceware.org/bugzilla/show_bug.cgi?id=28972 will be updated when this patch is checked in. Since you are the gprofng owner, you don't need extra approval to check in your bug fix. Thanks. > * gprofng/libcollector/Makefile.am: Rename lib_LTLIBRARIES to > pkglib_LTLIBRARIES > * 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: Likewise. > * 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 | 3 +- > gprofng/gp-display-html/Makefile.in | 3 +- > gprofng/libcollector/Makefile.am | 2 +- > gprofng/libcollector/Makefile.in | 76 ++++++++++++++------------- > gprofng/src/Makefile.am | 2 +- > gprofng/src/Makefile.in | 80 ++++++++++++++--------------- > gprofng/src/envsets.cc | 6 +-- > 11 files changed, 91 insertions(+), 97 deletions(-) > > diff --git a/gprofng/Makefile.am b/gprofng/Makefile.am > index 3bf707412ca..d072c9c46c6 100644 > --- a/gprofng/Makefile.am > +++ b/gprofng/Makefile.am > @@ -40,14 +40,12 @@ jdk_inc = @jdk_inc@ > LD_NO_AS_NEEDED = @LD_NO_AS_NEEDED@ > GPROFNG_CFLAGS = @GPROFNG_CFLAGS@ > GPROFNG_CPPFLAGS = @GPROFNG_CPPFLAGS@ > -GPROFNG_LIBDIR = @GPROFNG_LIBDIR@ > > 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 62005dc2b46..ed0f34a2c14 100644 > --- a/gprofng/Makefile.in > +++ b/gprofng/Makefile.in > @@ -264,7 +264,6 @@ FGREP = @FGREP@ > 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@ > @@ -383,8 +382,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 1371caa45d6..31593e7c5f3 100755 > --- a/gprofng/configure > +++ b/gprofng/configure > @@ -634,7 +634,6 @@ am__EXEEXT_TRUE > LTLIBOBJS > LIBOBJS > BUILD_SUBDIRS > -GPROFNG_LIBDIR > GPROFNG_CPPFLAGS > GPROFNG_CFLAGS > LD_NO_AS_NEEDED > @@ -12091,7 +12090,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > -#line 12094 "configure" > +#line 12093 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > @@ -12197,7 +12196,7 @@ else > lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 > lt_status=$lt_dlunknown > cat > conftest.$ac_ext <<_LT_EOF > -#line 12200 "configure" > +#line 12199 "configure" > #include "confdefs.h" > > #if HAVE_DLFCN_H > @@ -16627,8 +16626,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 23fee8705ac..2e5a722bfb0 100644 > --- a/gprofng/configure.ac > +++ b/gprofng/configure.ac > @@ -179,7 +179,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 b45d6888f76..a0d8e595f7b 100644 > --- a/gprofng/doc/Makefile.in > +++ b/gprofng/doc/Makefile.in > @@ -246,7 +246,8 @@ FGREP = @FGREP@ > 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@ > HELP2MAN = @HELP2MAN@ > INSTALL = @INSTALL@ > diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/Makefile.in > index 10f59ee067e..1abb2c58112 100644 > --- a/gprofng/gp-display-html/Makefile.in > +++ b/gprofng/gp-display-html/Makefile.in > @@ -210,7 +210,8 @@ FGREP = @FGREP@ > 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@ > HELP2MAN = @HELP2MAN@ > INSTALL = @INSTALL@ > diff --git a/gprofng/libcollector/Makefile.am b/gprofng/libcollector/Makefile.am > index 901d9a5f0ee..031f3567a4c 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) > diff --git a/gprofng/libcollector/Makefile.in b/gprofng/libcollector/Makefile.in > index 55039aa12af..7240ec5b8e6 100644 > --- a/gprofng/libcollector/Makefile.in > +++ b/gprofng/libcollector/Makefile.in > @@ -111,6 +111,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 > am__aclocal_m4_deps = $(top_srcdir)/../../config/depstand.m4 \ > $(top_srcdir)/../../config/lead-dot.m4 \ > $(top_srcdir)/../../config/override.m4 \ > + $(top_srcdir)/../../config/warnings.m4 \ > $(top_srcdir)/../../libtool.m4 \ > $(top_srcdir)/../../ltoptions.m4 \ > $(top_srcdir)/../../ltsugar.m4 \ > @@ -154,8 +155,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) > am__DEPENDENCIES_1 = > libgp_collector_la_DEPENDENCIES = $(am__DEPENDENCIES_1) > am__objects_1 = libgp_collector_la-gethrtime.lo \ > @@ -452,7 +453,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) > @@ -525,33 +526,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`; \ > @@ -561,19 +562,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) > @@ -999,7 +1000,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 > @@ -1034,7 +1035,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 > @@ -1062,7 +1063,7 @@ install-dvi: install-dvi-am > > install-dvi-am: > > -install-exec-am: install-libLTLIBRARIES > +install-exec-am: install-pkglibLTLIBRARIES > > install-html: install-html-am > > @@ -1104,27 +1105,28 @@ 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 \ > + 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-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-libLTLIBRARIES uninstall-myincludeHEADERS > + uninstall-myincludeHEADERS uninstall-pkglibLTLIBRARIES > > .PRECIOUS: Makefile > > diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am > index 84fd1df9a44..9921d41cd1f 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 \ > diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in > index 6b3c82b0bc2..d83dfbe271a 100644 > --- a/gprofng/src/Makefile.in > +++ b/gprofng/src/Makefile.in > @@ -154,9 +154,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) \ > @@ -329,7 +329,6 @@ FGREP = @FGREP@ > 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@ > @@ -532,7 +531,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 \ > @@ -608,33 +607,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`; \ > @@ -644,7 +643,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=; \ > @@ -1010,10 +1009,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 > @@ -1049,8 +1046,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,7 +1073,7 @@ 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 > > @@ -1116,29 +1113,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 \ > - 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 > + 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-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-man \ > + uninstall-man1 uninstall-pkglibLTLIBRARIES > > .PRECIOUS: Makefile > > 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.27.0 > -- H.J.