From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 00A713858D1E for ; Thu, 17 Mar 2022 17:00:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 00A713858D1E Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22HGnsR9015300 for ; Thu, 17 Mar 2022 17:00:49 GMT Received: from aserp3030.oracle.com ([141.146.126.71]) by mx0b-00069f02.pphosted.com with ESMTP id 3et52q1x4n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 17 Mar 2022 17:00:48 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22HH0TOB106084 for ; Thu, 17 Mar 2022 17:00:47 GMT Received: from nam04-mw2-obe.outbound.protection.outlook.com (mail-mw2nam08lp2173.outbound.protection.outlook.com [104.47.73.173]) by aserp3030.oracle.com with ESMTP id 3et64u2efm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 17 Mar 2022 17:00:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KZ2nA6kldhHQ4nMt30ZX3fXC7X/rzR0q9GSKgDV6kMIpi0V/ttYZYiACQmkVjVoGgOCujE/5nUlXgSl4K08pzvC5AWcKbMIAYzpHuGFfzwUWHGbkewWkUwVWM6aobe5ckhRpxVP6huxMPV91mmwSC3m+nSoS+ULCLysqmUSASn9TeriEnh+DBaIkftOJUkxTi9GwyUt0922wx/j/+gDwlBZEMkRSQ7V9MSkZkUDYHU6YTekXeC+5LMDqDyWzdR8qYdXkZ9s4wD8LGOJ+88ABJnzQF2zmoQpKo5ETc8Xy7F1AzCkDjYTQuSZgPYO694FfqVtgeltRgnyj9kfdkgx3rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MydK7NXedv1z2EUek/DUjiCZtKzwbIoRiFsLp/9xn08=; b=HnkHe3VDpSJE1nCJ90onR36JuosFh30oMR4rQ2kWu5NS7IOnfXEmYS7TmalIFOnsjLd6Sd9NZFFOpEbqviOgq0uafjW4psYthzALOEVLpcNSitC54kGniTzNzNOkOgwdb6dpWrm9KCLx53Pg0DNguA35cfWWhazMpbGCXYMNuIBjUMx9/448Rb4Mhj0TYeIuZusL3VnXO0k8j1yQwmyHuNhKUAGMsXMmrIqSVnByGh87T9orfphhAeL/V1bjbA0hrepbbkeDKRF5c9jLMRfUxQTv6fwdSMjdgT99CTL8eyXMNjNGyBVJwjGdiy4a6cAxIwBUWcDtDk2iOe3j0o/7zQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) by MN2PR10MB4318.namprd10.prod.outlook.com (2603:10b6:208:1d8::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.17; Thu, 17 Mar 2022 17:00:44 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::f901:29d2:1b8c:4306]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::f901:29d2:1b8c:4306%9]) with mapi id 15.20.5081.017; Thu, 17 Mar 2022 17:00:44 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Subject: [PATCH] PR28972, gprofng libraries should be installed under $(pkglibdir) Date: Thu, 17 Mar 2022 10:00:36 -0700 Message-Id: <20220317170036.3748419-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.27.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: BYAPR08CA0013.namprd08.prod.outlook.com (2603:10b6:a03:100::26) To SA2PR10MB4636.namprd10.prod.outlook.com (2603:10b6:806:11e::10) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5da0aad2-8253-45b2-7a05-08da0837aca9 X-MS-TrafficTypeDiagnostic: MN2PR10MB4318:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bJIrz1p7/+DWflUXHnDqNMyxZtoRhMIMxVIfb6PKG0ck/YY+xZGDYaNW1KNryNGOGdNDSdtfR9cn6YfGO7Wa0HwMbRSgZDfzzQ3UPhiFtWW8kbo6suYC67tbrOIIHvoFfGhPGwsQEI/dY8Sd0s6bboNGhK0qmQger5H5oqVutdrAjnqa/xJzTl26PobbQuySs5NHrP4CZ9XjDmtzQ5d0sqCIhJ+q2Mw+Xr5hO6S6LpPTHer7v9kzLYzyzTD8m+fmf1KT01qQkOZumXCSZWqHFC4HZANwLa6rIWqwIiMX7Nwz94p4aCWUj8a2bdT8bkhvGTvp5qe6XAYqlDogQXqNog6WPuI4o0IHFpTxK4FuucszzmD+25drcvcfrlHze973N+0wau0IvGZJ02LCITqdBduJa7WJQXnmX+cnU396+zWlkn1cVzYMfrNxzK3PdUaPWq+RSPXHWppTN7/citKk5I8IXjYPdBiJzyiEL2TaQ1m4fJi+6hF9kLe5pzaLSXcBlLyF2S6CDUh65CqqAb/7NPvj2RjAbgsCdcU9ALFMCjkkmNxNETmCz+A1pQTOFt3Et1BecErJgNjW7ZKLbmmVPWfHBonJSEkGEIvlbDCpmfakTiqp8NqbV8Zkw9NyJ+srgVkozVjNisL5o2L5ExUANM9paQyhabVEFYqTyJB8oRIFigC+yJ5/OUktUbxHPLOQNDJqUQlSVpZYTnuwYWuNSQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SA2PR10MB4636.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230001)(366004)(6512007)(9686003)(2906002)(8936002)(26005)(36756003)(52116002)(316002)(38100700002)(38350700002)(186003)(86362001)(6506007)(508600001)(83380400001)(6666004)(1076003)(5660300002)(30864003)(6916009)(66946007)(66476007)(6486002)(66556008)(2616005)(8676002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?31Pdvls33QQf96uYezj18oKE4M3d6+ccqa4aM3UqBoN7PNsfRh5yMrbPAa4k?= =?us-ascii?Q?V1uI6OI/W79lp5YqNOacL2vJNDe+Y5Uzy80zbWmJyUDnL8GHHHy1F7LE7B5n?= =?us-ascii?Q?+FHwKkcKWo4aXeGCl7/mIqxCtThhU/7YusmH++GSPNSyt3lZJ7RfIzYLv0RI?= =?us-ascii?Q?n1KH7w+gvIblHs9YEV/DfzEEyqQo2buKa0oIEBgePWrw9Bxo/r88FpXw8N4M?= =?us-ascii?Q?AKyuDp5yQPLiUoVuPURYzCoAWwSCXHwvKU0CwwBZX8S1OZIECwdWpNIsLjaW?= =?us-ascii?Q?QWq9ICA5HtH6T100c1+MDLMbZgYcJPHzZKCoUPtfihghjS6STJNyFTzRMRo3?= =?us-ascii?Q?pkC+NmcAtWsPgqPWdF4ZAF5fk16nfO37qWxrttbrvh/O1a7txhgPzOUo5OVL?= =?us-ascii?Q?CnvLIxYAbaWj5qniJhyG21F31QQS3duP4gEqYvTHlKQTBiT/jFepoukN+6tq?= =?us-ascii?Q?j2rUkEydq+UCw/cqELjRxYXQ8NgQs3Y3ky8SbYCB8fw+rev5XyiR478PdICp?= =?us-ascii?Q?YI2Hq2Vs5CS54ojusSQKMlQ8JbmAPi1nt2cT08KWAqWkIcOXlctL7SwsxKDl?= =?us-ascii?Q?B/ub7grbaAOdCmppbHHeTucNOj5D6oNNaCy5fttE26DWlJXyxx4xcG9nPrxG?= =?us-ascii?Q?09R8+mMbTnJpnxs9ZeH6I1w49Y9hy18YJa8UXHXmok3UcnZIP3K4jCrj6JB4?= =?us-ascii?Q?7i+/bHqa7nVRKJEdd4dk4W7ovR4SdBEomqf0EYzaHeyTsAqVsYqRtpfgv+m8?= =?us-ascii?Q?Z2LW86uuOEjuK0qtb0sEY6Ug5MBaeJGk0865trL081+wfWMciwXW4z8cRjav?= =?us-ascii?Q?GmLuqweWyZ99xRt6R4+imu9kAv/kPa2Hi0iUdbvdSBrRTKMIaa8wkP/UY9+o?= =?us-ascii?Q?qQpuVdIiN+8VpHZ9XQNpK8oMTo0rUKFjHh+mzailo13/CQRtcGPSdDc6uyMN?= =?us-ascii?Q?H1ilCflOfg76js9KEUaR3Jmo2rvLGXpfcX5wiRZS6bVOlNZolDPMLeBZnQbo?= =?us-ascii?Q?FxIvYm3xUk32bhWKOpvWobLmsOq4QRdKZXZ/HR58YdA2Y0UDOdI8yds/T3bG?= =?us-ascii?Q?ENN1xZ5kdIINbE4iCqH6O61XS/V8+/rEYdAWRXHPZJDpHj2jHBYbleMWn8BJ?= =?us-ascii?Q?GYRcHM2JNkcKnHSUf1uSWhJcOCCrh7ZGhAJtMkEUIkBSNWielk+d1ThHCtFV?= =?us-ascii?Q?FyTrZajtWmRk3mQBTE4NPRu3uoDgb2H4Zk12cwlPLyVioAnWpqpwC9ud+29Q?= =?us-ascii?Q?4HXhtRUuWp/lhIyJdLbr979k81QXXupiuZPQ7BYqyj28xjRqaxbWJ2kdrD34?= =?us-ascii?Q?qDM1uxhXs/6v0x/+Pu8wdTgVAb6R7E6LPArvFugx6hQBUcqEKv0IOM08LL2f?= =?us-ascii?Q?gupLqTMb/zku3WzZi5eB5ah0RoN7Q7m1jMhqlop+uT2slL1EzaIxb9TIOTyy?= =?us-ascii?Q?G7ttPmmZZlOFt+X8iyx14iz4eHkKaaTqWnZTifCZzcwXLJ4hCbBPbw=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5da0aad2-8253-45b2-7a05-08da0837aca9 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Mar 2022 17:00:44.1857 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: yVFUd/twToaQ1aEi6h8Lptk6Esgx7ZhF5rqRpIpoUMVpHuGPF+Y2pX0P1Wv5hO6te4ayceAB/jY7Pt7MvQAPXcI49T8iCaGq1vNwb9HJvBw= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4318 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10289 signatures=693715 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 bulkscore=0 phishscore=0 suspectscore=0 mlxscore=0 adultscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203170095 X-Proofpoint-GUID: S28OySTKjNTnAJlH6HMJTZiRdFoFfKSK X-Proofpoint-ORIG-GUID: S28OySTKjNTnAJlH6HMJTZiRdFoFfKSK X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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: Thu, 17 Mar 2022 17:00:55 -0000 From: Vladimir Mezentsev gprofng/ChangeLog 2022-03-17 Vladimir Mezentsev * 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