summaryrefslogtreecommitdiff
path: root/gprofng
diff options
context:
space:
mode:
authorVladimir Mezentsev <vladimir.mezentsev@oracle.com>2022-06-28 09:04:49 -0700
committerVladimir Mezentsev <vladimir.mezentsev@oracle.com>2022-06-28 21:36:26 -0700
commit6284f0aa11381a472d7f0ecac6b24b989d2c12db (patch)
treee846847980e4e69f3bbdfa0a600ce93c7284595c /gprofng
parent22a8ddfe934283113c8e88de3b49caee40343e14 (diff)
downloadbinutils-gdb-6284f0aa11381a472d7f0ecac6b24b989d2c12db.tar.gz
gprofng: use $(sysconfdir) instead $(prefix)/etc
gprofng/ChangeLog 2022-06-28 Vladimir Mezentsev <vladimir.mezentsev@oracle.com> PR gprofng/29191 * src/Makefile.am: Use $(sysconfdir) instead $(prefix)/etc. * src/Settings.cc: Likewise. * src/Makefile.in: Rebuild.
Diffstat (limited to 'gprofng')
-rw-r--r--gprofng/src/Makefile.am9
-rw-r--r--gprofng/src/Makefile.in8
-rw-r--r--gprofng/src/Settings.cc2
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;