espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-10-09 08:56:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

gprofng: use $(sysconfdir) instead $(prefix)/etc

Browse Source 
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.
This commit is contained in:
Vladimir Mezentsev
2022-06-28 09:04:49 -07:00
parent 22a8ddfe93
commit 6284f0aa11
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gprofng/src/Makefile.am
View File

@ -104,7 +104,12 @@ LIBGPROFNG = libgprofng.la
ZLIB = @zlibdir@ -lz ZLIB = @zlibdir@ -lz
ZLIBINC = @zlibinc@ 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)/../common \
-I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \
-I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC) -I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC)
@ -135,7 +140,7 @@ libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \
$(GPROFNG_LIBADD) \ $(GPROFNG_LIBADD) \
$(PTHREAD_LIBS) -ldl $(PTHREAD_LIBS) -ldl
dbedir = $(prefix)/etc dbedir = $(SYSCONFDIR)
dbe_DATA = $(srcdir)/gprofng.rc dbe_DATA = $(srcdir)/gprofng.rc

8
gprofng/src/Makefile.in
View File

@ -534,7 +534,11 @@ LIBGPROFNG = libgprofng.la
# case both are empty. # case both are empty.
ZLIB = @zlibdir@ -lz ZLIB = @zlibdir@ -lz
ZLIBINC = @zlibinc@ 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)/../common \
-I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \
-I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC) -I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC)
@ -560,7 +564,7 @@ libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \
$(GPROFNG_LIBADD) \ $(GPROFNG_LIBADD) \
$(PTHREAD_LIBS) -ldl $(PTHREAD_LIBS) -ldl
dbedir = $(prefix)/etc dbedir = $(SYSCONFDIR)
dbe_DATA = $(srcdir)/gprofng.rc dbe_DATA = $(srcdir)/gprofng.rc
gp_archive_SOURCES = gp-archive.cc ArchiveExp.cc gp_archive_SOURCES = gp-archive.cc ArchiveExp.cc
gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)

2
gprofng/src/Settings.cc
View File

@ -407,7 +407,7 @@ Settings::read_rc (bool ipc_or_rdt_mode)
free (rc_path); free (rc_path);
// Read system-wide file // 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) if (access (rc_path, R_OK | F_OK) != 0)
{ {
StringBuilder sb; StringBuilder sb;