aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2011-01-22 07:14:08 +0000
committerRob Austein <sra@hactrn.net>2011-01-22 07:14:08 +0000
commit2dc060bca79d8d557216dfe6ca99210ec67f5fa3 (patch)
tree7914a122686f11c7b40793613acded8cee789c58
parentdad861e65ef72a05452175517650d594a74cfeb9 (diff)
Installation fixes
svn path=/pywrap/Makefile.in; revision=3631
-rw-r--r--pywrap/Makefile.in2
-rw-r--r--rpkid/Makefile.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/pywrap/Makefile.in b/pywrap/Makefile.in
index cd00348c..d9a56f15 100644
--- a/pywrap/Makefile.in
+++ b/pywrap/Makefile.in
@@ -44,7 +44,7 @@ distclean: clean
install: all
${INSTALL} pywrap ${sbindir}
- ${INSTALL} ${PYWRAP_LIBDIR}
+ ${INSTALL} -d ${PYWRAP_LIBDIR}
${INSTALL} ${PYWRAP_LIBS} ${PYWRAP_LIBDIR}
deinstall uninstall:
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 99a8be23..8c9c2569 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -58,10 +58,10 @@ clean::
rm -f ${SCRIPTS}
install:
- ${SETUP_PY} install
+ ${SETUP_PY} install --prefix '${prefix}'
uninstall deinstall:
- dir=`${PYTHON} -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'`; \
+ dir=`${PYTHON} -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib("${prefix}")'`; \
egg=`${PYTHON} setup.py --fullname`; \
rm -rfv $$dir/rpki $$dir/$$egg-*.egg-info; \
for i in ${SCRIPTS}; do rm -fv ${sbindir}/$$i; done