summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-01-19 03:32:49 -0500
committerMike Gilbert <floppym@gentoo.org>2014-01-19 03:32:49 -0500
commit4c49cdcea51b8369e7b1a54ded2ab290b241a317 (patch)
tree7d1b1dad1e43ddc507a9cc77d933f3e658c2d4ef
parentSupport Windows binaries via @EXEEXT@, bug 337601 (diff)
downloadeselect-python-4c49cdcea51b8369e7b1a54ded2ab290b241a317.tar.gz
eselect-python-4c49cdcea51b8369e7b1a54ded2ab290b241a317.tar.bz2
eselect-python-4c49cdcea51b8369e7b1a54ded2ab290b241a317.zip
Respect EPREFIX in python-wrapper when reading config, bug 498356 by jlec.
-rw-r--r--Makefile.am1
-rw-r--r--python-wrapper.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 69fd8d8..06f7d1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,5 @@
bin_PROGRAMS = python-wrapper
+python_wrapper_CPPFLAGS = -DENVD='"$(sysconfdir)/env.d"'
eselectdir = $(datadir)/eselect/modules
nodist_eselect_DATA = python.eselect
diff --git a/python-wrapper.c b/python-wrapper.c
index 6596c30..75a1de4 100644
--- a/python-wrapper.c
+++ b/python-wrapper.c
@@ -12,7 +12,11 @@
#include <unistd.h>
#include <sys/stat.h>
-#define ENVD_CONFIG "/etc/env.d/python/config"
+#ifndef ENVD
+#define ENVD "/etc/env.d"
+#endif
+
+#define ENVD_CONFIG ENVD "/python/config"
/* 127 is the standard return code for "command not found" */
#define EXIT_ERROR 127