[PATCH] Do not install profile.d/debuginfod.*sh files unless debuginfod is enabled

Dmitry V. Levin ldv@altlinux.org
Sat Oct 31 18:55:28 GMT 2020


Fixes: 94708e964601 ("PR25461: add /etc/profile.d files for default $DEBUGINFOD_URLS")
Fixes: fee123fb771f ("PR25461: uninstall /etc/profile.d files for distuninstallcheck")
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---
 config/ChangeLog   | 5 +++++
 config/Makefile.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/config/ChangeLog b/config/ChangeLog
index d3ecd6c6..c532f7e6 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-31  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* Makefile.am (install-data-local, uninstall-local): Conditionalize
+	on DEBUGINFOD.
+
 2020-10-30  Mark Wielaard  <mark@klomp.org>
 
 	* elfutils.spec.in: Update for 0.182.
diff --git a/config/Makefile.am b/config/Makefile.am
index e56f32a5..ef28dab6 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -36,7 +36,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libelf.pc libdw.pc
 if DEBUGINFOD
 pkgconfig_DATA += libdebuginfod.pc
-endif
 
 install-data-local:
 	$(INSTALL_DATA) profile.sh -D $(DESTDIR)$(sysconfdir)/profile.d/debuginfod.sh
@@ -44,6 +43,7 @@ install-data-local:
 
 uninstall-local:
 	rm -f $(DESTDIR)$(sysconfdir)/profile.d/debuginfod.sh $(DESTDIR)$(sysconfdir)/profile.d/debuginfod.csh
+endif
 
 if MAINTAINER_MODE
 $(srcdir)/elfutils.spec.in: $(top_srcdir)/NEWS

-- 
ldv


More information about the Elfutils-devel mailing list