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 1BD54385828E for ; Tue, 28 Jun 2022 16:20:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 1BD54385828E Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25SGJI6Y030877 for ; Tue, 28 Jun 2022 16:20:02 GMT Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3gwtwu6ncu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Jun 2022 16:20:01 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.16.1.2/8.16.1.2) with SMTP id 25SFoupb033116 for ; Tue, 28 Jun 2022 16:20:00 GMT Received: from nam12-dm6-obe.outbound.protection.outlook.com (mail-dm6nam12lp2173.outbound.protection.outlook.com [104.47.59.173]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com with ESMTP id 3gwrt8bqea-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 28 Jun 2022 16:20:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j8X0P0MIXZTX2UZ7S3vtIIpjPB6EkgWmggKzBSRiRL0/1FouFy/Wfb/adhmh7+1+UN3piL10fuupcsoL9+t5RyE/AbgbM452Bb6qoE5OdWx+IwgJMACRlUDEnA3YQJf68Tt7GpIqmGqybI448Hyd4uqAwvhHtLwcxW/lWuXYXmbibghhkpPCDFw4aL7W9Ry5sWBN2EQ0epBDT3vqED5bzZ/5Ivo7nR9z37H8PCjW8po+M7ZvWlupBJ7veP/hF6nzCdMjt87/K/QaJy7puACIVKqu2tNzovdPwfhnXomzEwE07tdPjpeuFhP2l9LToxRI9G/XALFmC2lznRXda6sz1g== 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=I9TOA123+G/QF5ksWCmruWb8alej8N8LgBTpGEWV5iI=; b=FjKZNKdrT4mtHlj+v4TXeBgAX7g/tdmhb5u2O8z2HULdqKiPXcxWrsc773IUMQTBaHkKacMtolNJAr2C1rAQa8H2V0HktWnyYA/VQkYaxe8/Ll408SF74O4QK/NqBxKVryxgyv9snX8OlBo79UQcOTSokixPGmXtNO6KVfE6X2qRTxjAXvEbNECS6g26Ez+meU3CQ5zFcVVhq+sSO9fkdxm/HKLjhptEHEjrLysk2OvYtyPlRBEs8S49d7YbgZ8/SlS53H82Dj39jiE88ytzxONBb/a69XSHfktesR9asmrwVDnJDx6yYYgY0cnwxNmZCn01xMwTw2TCQ8cmZWmSGw== 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 DM6PR10MB2796.namprd10.prod.outlook.com (2603:10b6:5:64::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Tue, 28 Jun 2022 16:19:58 +0000 Received: from SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::cc8d:db23:414b:ce5f]) by SA2PR10MB4636.namprd10.prod.outlook.com ([fe80::cc8d:db23:414b:ce5f%5]) with mapi id 15.20.5373.018; Tue, 28 Jun 2022 16:19:58 +0000 From: vladimir.mezentsev@oracle.com To: binutils@sourceware.org Subject: [PATCH] gprofng: use $(sysconfdir) instead $(prefix)/etc Date: Tue, 28 Jun 2022 09:19:51 -0700 Message-Id: <20220628161951.165677-1-vladimir.mezentsev@oracle.com> X-Mailer: git-send-email 2.27.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: DM6PR10CA0007.namprd10.prod.outlook.com (2603:10b6:5:60::20) 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: 9ec19b04-7fb5-41eb-1a6e-08da59220b92 X-MS-TrafficTypeDiagnostic: DM6PR10MB2796:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d7vSpaQgM0/XqX1lKyEjdS1hgN0LctN+NLbqISNI8JEpIWR0HvgV/LWz5eyAm2sGzWYA45xiy3Wqy6Qy6dfxTYKA4H0b9qXzLwo9glCcYl1qCK0kGGKNEYVk0tcZD9+9nynV8140rPy3/UnScs3D66z1NozKW09Utw7XNYXU7LqmfRljW3Xpbd84bFuJDNPeouAMMiz2KhI7x7e6GevJCrnEHTJbUKFQQu0dfQ3FlakxKpLR6yQJ+qEXAob0XQd8GRcnQEwfSO2D/DunRAeAvpNK6ELAkrYDX9PcF1PVSmU1x25KANnGO8OelW9DmWpt8QBd1KUQnBV43KmMCVBt8Adfeok1jSpQnuspnfzGIBxon1bfRwriQG3qVGNs+Lys7TYIq30My3s8uS8T6SL1Gw/t3SyPd6rTwXNK+udsyQff1UA6wyxoMx+CRASbCuqb57W7YG8VUAKBCQ2zTY3nkrwv5aE3DolhYJxD8d9gArA9LRIFhxVVncgoTfLQUiaePS+nvYpCo8oWXRPZRbegXfuclxpts+Lj346F8Qnh90k3KLDVhnYblzd9t3aCtJZmM1D2bkp1HkBRVCrmFP46RT1Li0uCivyV++T431S13m1k0q6b3Y1Iuo8G0RJs8Vq+EqlIAKJGK2b01iaRKGUKrsx3VkgshWO05Cw3yAxvtHQ7NUskdobL9dQ2ufdwIgOgyMGbmLNjhu1jgKtKF0Gt/ZMT7Q8Y/nXUnTrSh7A7AFw= 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:(13230016)(136003)(376002)(396003)(366004)(39860400002)(346002)(8676002)(478600001)(6916009)(83380400001)(66556008)(2616005)(36756003)(66476007)(8936002)(316002)(86362001)(6486002)(186003)(66946007)(5660300002)(6506007)(9686003)(6666004)(2906002)(1076003)(38100700002)(52116002)(6512007)(41300700001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xwIMJSuZ9dc7s3oJjSLZcaskjJyG+K9KG09IZBVwfwQMJy7TQuI6k+Q0xNg1?= =?us-ascii?Q?tiIxwim/yP3OVhMoTSPzuWhUWVIAQ29noRUkYVqtV+nlrJrS68N/1Jy3hgye?= =?us-ascii?Q?gzFAH0DixUwzPgdZpW8KTEFK5rp4C/qdPE/gXP6ZUa4VYMZfCHQpc4zSytDs?= =?us-ascii?Q?1rPEW4SursoQEJGe8FrUj8IIsXcUvWc85e5RZY18r21FHvDYOeg//udxLizd?= =?us-ascii?Q?XWA6WmdUBc9AxT0IKKo/YiKLbD0lGFa17qgOlQH7pZzgNrp9iUGVFXNNX/ei?= =?us-ascii?Q?CYhOd4k6atjf5eg319A6tWJnk358L52Tdeb9bKtZPqg2CP9sXgIXwoq8HpDZ?= =?us-ascii?Q?9GSrJh/MyDFg+Kfr50IJhVpjgd/jfs6dvzGx9WkYOhlRIGnBnOFz2W3s6fO3?= =?us-ascii?Q?x/UEenOnjfE4vvDZmKP8T+c7MufSSB4HM+Ld8SDTPfv079rs69SS2Dd8NvXy?= =?us-ascii?Q?ikYA8g0fkHKOPRyapTKYh93K9OmEsWcNbZruenWKLiXEZOrDtTT6nxkVymev?= =?us-ascii?Q?SVyzSr1f5rsWnH/orTs2RU15xubYUMUnVWPSCKdAY1dVxyMhUziaeOmJNK9T?= =?us-ascii?Q?ihcAul503aPy0HyCZ6SiAdzGLSjn7bBSXHwSzpUT1NJvun9PDVSQxXDcmGwt?= =?us-ascii?Q?Jby8hctd0LPZBjLVR/ZGrdr+iZ1CEBb3vzgjCVjD4EEHDf4DHFqbfEg+GQ5h?= =?us-ascii?Q?TDksjpq4rUmichGB/Ep7HyWiIy4zSiv2YBhf7JXUHNHNwVrSDTtW1xWDtRjK?= =?us-ascii?Q?cLGQrjQFMJPPJmAOLWKAkS+dVDu3GjzD0/JGSNqkTN+zGK9+po+Dl0+h292G?= =?us-ascii?Q?7NOOACB5VydnMcV5pVwpiRLKcuvfChls/YCWl9mNhy1EsTyL8afWrqgkhthE?= =?us-ascii?Q?bs2vyu/gu3dnQC6oLlU8aThEJxfeDDEIhmUgxP0F97+y6w6R1qph+7p6wZY2?= =?us-ascii?Q?TR4fksQszoD3jMmXgSxETQpMikmr4Cx1oCmufIQ9kxp25Xce9lWJnGeVGRd7?= =?us-ascii?Q?he51/UNOXRtTxBpS0EJUWFR7E1lHBThmieKojBtR2d2BvsQgjrcMB2m0v79H?= =?us-ascii?Q?kSU5RfxbFAG1UfzuONvfpD7UV+IjfHGrHV7DdvZSIIJ4FVDWAeiB5Ze6VDj3?= =?us-ascii?Q?P1YToUMCyw2YVT1lxyFIdmCdIUaLZUXKDJROR3is/Z6RbLqz9SnrkoOKYCRg?= =?us-ascii?Q?8K+8YYd3RfHAtbBttrZtb4n/Ses0LFIwcoUwW+oqAUgubu6qcuJOo4XZWduW?= =?us-ascii?Q?rkMfSherueUjvDr9ZZd3osgAUM2B8X3n1tr+C2qsBW5p31wcZWJiyfLHij1Z?= =?us-ascii?Q?MhsJMOkq4zQEQuVWHDQxdPmRZwX77u4ATIFCZ1pJ55VM3ozrY5L23g8CokJw?= =?us-ascii?Q?EHbAadWuyuvXCfuxFddi6Bmn/56OLHVbXs4bMKcf+I7Y4VF4kl8jJ7P3wlaS?= =?us-ascii?Q?JLRFH4EP0vOh7l+2OMtQ94FMC3dj+IlzfrXf+3xgfOHA9j91lmTCu3rWtvri?= =?us-ascii?Q?5wWRpHz2U4gwGIaKeG6FrYtJVqJdcIQZT+xmwap4tmVbASkGbenT+MVEIcxM?= =?us-ascii?Q?YicVWUBClPzMgI3JQbz5CpAhb+PsdpMNTw+lo5YEm8/ILuws+jIkSx8wM09Q?= =?us-ascii?Q?iE9SPPTcuONtSmTPbXUlQRDNM/Ba0emtZaNsHF7FA1fn?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ec19b04-7fb5-41eb-1a6e-08da59220b92 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4636.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 16:19:58.6105 (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: OWqLqf/gj+RXm+/4uPVT5MQskNWAGJR8SGyKxecil4lbSnkGcquHYo0ffyZhC5M/M8l1vT66tW92a6zTNah34OZHHToq2lkTY8kqZrWVSbk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB2796 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517, 18.0.883 definitions=2022-06-28_09:2022-06-28, 2022-06-28 signatures=0 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 mlxlogscore=999 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000 definitions=main-2206280064 X-Proofpoint-ORIG-GUID: m1CwiWYjByS1lAAtJSuqAJ7lcEqw-vD_ X-Proofpoint-GUID: m1CwiWYjByS1lAAtJSuqAJ7lcEqw-vD_ X-Spam-Status: No, score=-12.1 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_H2, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: Tue, 28 Jun 2022 16:20:04 -0000 From: Vladimir Mezentsev gprofng/ChangeLog 2022-06-28 Vladimir Mezentsev PR gprofng/29191 * src/Makefile.am: Use $(sysconfdir) instead $(prefix)/etc. * src/Settings.cc: Likewise. * src/Makefile.in: Rebuild. --- gprofng/src/Makefile.am | 9 +++++++-- gprofng/src/Makefile.in | 8 ++++++-- gprofng/src/Settings.cc | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index f2bd0a04a9a..bcdd03bfae6 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -104,7 +104,12 @@ LIBGPROFNG = libgprofng.la ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ -AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"@localedir@\" -I.. -I$(srcdir) \ +LOCALEDIR = @localedir@ +SYSCONFDIR = @sysconfdir@ + +AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \ + -DSYSCONFDIR=\"$(SYSCONFDIR)\" \ + -I.. -I$(srcdir) \ -I$(srcdir)/../common \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ -I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC) @@ -135,7 +140,7 @@ libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \ $(GPROFNG_LIBADD) \ $(PTHREAD_LIBS) -ldl -dbedir = $(prefix)/etc +dbedir = $(SYSCONFDIR) dbe_DATA = $(srcdir)/gprofng.rc diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index 5101b3930fa..27747708861 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -534,7 +534,11 @@ LIBGPROFNG = libgprofng.la # case both are empty. ZLIB = @zlibdir@ -lz ZLIBINC = @zlibinc@ -AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"@localedir@\" -I.. -I$(srcdir) \ +LOCALEDIR = @localedir@ +SYSCONFDIR = @sysconfdir@ +AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \ + -DSYSCONFDIR=\"$(SYSCONFDIR)\" \ + -I.. -I$(srcdir) \ -I$(srcdir)/../common \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ -I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC) @@ -560,7 +564,7 @@ libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \ $(GPROFNG_LIBADD) \ $(PTHREAD_LIBS) -ldl -dbedir = $(prefix)/etc +dbedir = $(SYSCONFDIR) dbe_DATA = $(srcdir)/gprofng.rc gp_archive_SOURCES = gp-archive.cc ArchiveExp.cc gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) diff --git a/gprofng/src/Settings.cc b/gprofng/src/Settings.cc index 965b9174da6..39cb806dd4e 100644 --- a/gprofng/src/Settings.cc +++ b/gprofng/src/Settings.cc @@ -407,7 +407,7 @@ Settings::read_rc (bool ipc_or_rdt_mode) free (rc_path); // Read system-wide file - rc_path = dbe_sprintf (NTXT ("%s/../etc/gprofng.rc"), app->get_run_dir ()); + rc_path = dbe_sprintf (NTXT ("%s/gprofng.rc"), SYSCONFDIR); if (access (rc_path, R_OK | F_OK) != 0) { StringBuilder sb; -- 2.27.0