[PATCH 5/7] Always use $prefix in directory names.
David Shea
dshea at redhat.com
Fri Nov 8 14:57:32 UTC 2013
Hardcoding absolute paths breaks the distcheck target, since it uses
--prefix instead of $DESTDIR to change the installation destination. For
files in /etc, we can use $sysconfdir and rpmbuild will set it to
/etc instead of $prefix/etc. For the gi overrides directory, it looks like
other projects just assume that it's under $pyexecdir, which it is.
---
data/liveinst/Makefile.am | 2 +-
data/liveinst/console.apps/Makefile.am | 2 +-
data/liveinst/pam.d/Makefile.am | 2 +-
dracut/Makefile.am | 2 +-
widgets/python/Makefile.am | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/data/liveinst/Makefile.am b/data/liveinst/Makefile.am
index 33ea69c..9e30c9a 100644
--- a/data/liveinst/Makefile.am
+++ b/data/liveinst/Makefile.am
@@ -25,7 +25,7 @@ dist_sbin_SCRIPTS = liveinst
desktopdir = $(datadir)/applications
desktop_DATA = liveinst.desktop
-xinitdir = /etc/X11/xinit/xinitrc.d
+xinitdir = $(sysconfdir)/X11/xinit/xinitrc.d
dist_xinit_SCRIPTS = zz-liveinst.sh
endif
diff --git a/data/liveinst/console.apps/Makefile.am b/data/liveinst/console.apps/Makefile.am
index f153902..19d56a8 100644
--- a/data/liveinst/console.apps/Makefile.am
+++ b/data/liveinst/console.apps/Makefile.am
@@ -18,7 +18,7 @@
# Author: David Cantrell <dcantrell at redhat.com>
if IS_LIVEINST_ARCH
-consoledir = /etc/security/console.apps
+consoledir = $(sysconfdir)/security/console.apps
dist_console_DATA = liveinst
endif
diff --git a/data/liveinst/pam.d/Makefile.am b/data/liveinst/pam.d/Makefile.am
index 9b2bf06..cd1ad8c 100644
--- a/data/liveinst/pam.d/Makefile.am
+++ b/data/liveinst/pam.d/Makefile.am
@@ -18,7 +18,7 @@
# Author: David Cantrell <dcantrell at redhat.com>
if IS_LIVEINST_ARCH
-pamdir = /etc/pam.d
+pamdir = $(sysconfdir)/pam.d
dist_pam_DATA = liveinst
endif
diff --git a/dracut/Makefile.am b/dracut/Makefile.am
index 3bab16a..7c694d4 100644
--- a/dracut/Makefile.am
+++ b/dracut/Makefile.am
@@ -17,7 +17,7 @@
#
# Author: Will Woods <wwoods at redhat.com>
-dracutdir = /usr/lib/dracut/modules.d/80$(PACKAGE_NAME)
+dracutdir = $(prefix)/lib/dracut/modules.d/80$(PACKAGE_NAME)
dist_dracut_SCRIPTS = module-setup.sh \
python-deps \
anaconda-lib.sh \
diff --git a/widgets/python/Makefile.am b/widgets/python/Makefile.am
index 81910ec..7a2277d 100644
--- a/widgets/python/Makefile.am
+++ b/widgets/python/Makefile.am
@@ -19,7 +19,7 @@
# Red Hat Author(s): Chris Lumens <clumens at redhat.com>
#
-overridesdir = $(shell python -c "import gi ; print gi._overridesdir")
+overridesdir = $(pyexecdir)/gi/overrides
dist_overrides_PYTHON = AnacondaWidgets.py
MAINTAINERCLEANFILES = Makefile.in
--
1.8.4.2
More information about the anaconda-patches
mailing list