diff options
| author | Rob Austein <sra@hactrn.net> | 2013-01-12 01:50:45 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-01-12 01:50:45 +0000 |
| commit | ddc122bdff0591ad350a985beed14cdde6a8fd73 (patch) | |
| tree | aee2eabe6dd3a3984f2397501dbc13cc425333e8 /rpkid | |
| parent | e26178710a14d8983d89ec4a17d93282f7349162 (diff) | |
Using @cwd in FreeBSD pkg-plist seems to work, and is much less of a
change from what has until now been standard practice, so going with
that.
svn path=/branches/tk377/; revision=4967
Diffstat (limited to 'rpkid')
| -rw-r--r-- | rpkid/Makefile.in | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in index 6a92433e..c384f4b4 100644 --- a/rpkid/Makefile.in +++ b/rpkid/Makefile.in @@ -43,13 +43,15 @@ SETUP_PY = \ AC_CFLAGS='${CFLAGS}' \ AC_LDFLAGS='${LDFLAGS}' \ AC_LIBS='${LIBS}' \ - AC_SBINDIR='${DESTDIR}${sbindir}' \ + AC_SBINDIR='${sbindir}' \ AC_SCRIPTS='${SCRIPTS}' \ AC_ABS_BUILDDIR='${abs_builddir}' \ - AC_LIBEXECDIR='${DESTDIR}${libexecdir}' \ + AC_LIBEXECDIR='${libexecdir}' \ AC_AUX_SCRIPTS='${AUX_SCRIPTS}' \ ${PYTHON} setup.py +SETUP_PY_ROOT = `${PYTHON} -c 'import sys; print "--root " + sys.argv[1] if sys.argv[1] else ""' '${DESTDIR}'` + POW_SO = rpki/POW/_POW.so SCRIPTS = rpki-sql-backup rpki-sql-setup rpki-start-servers irbe_cli irdbd \ @@ -108,7 +110,7 @@ clean:: rm -f ${SCRIPTS} ${AUX_SCRIPTS} ${SETTINGS} ${BUILD_SCRIPTS} install:: - ${SETUP_PY} install --record installed + ${SETUP_PY} install ${SETUP_PY_ROOT} --record installed @echo @echo "== Default configuration file location is ${sysconfdir}/rpki.conf ==" @echo @@ -209,24 +211,24 @@ all install clean test distclean deinstall uninstall installation-manifest:: COMPILE_PYTHON = \ rm -f $@; \ AC_PYTHON_INTERPRETER='${PYTHON}' \ - AC_RPKI_CONFIG_DIR='${DESTDIR}${sysconfdir}' \ + AC_RPKI_CONFIG_DIR='${sysconfdir}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-python-executable.py <$? >$@; \ chmod 555 $@ COMPILE_DJANGO = \ rm -f $@; \ AC_PYTHON_INTERPRETER='${PYTHON}' \ - AC_PYTHONPATH='${DESTDIR}${sysconfdir}/rpki' \ + AC_PYTHONPATH='${sysconfdir}/rpki' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-django-script.py <$? >$@; \ chmod 555 $@ COMPILE_SETTINGS = \ rm -f $@; \ AC_SECRET_KEY='${SECRET_KEY}' \ - AC_LOCALSTATEDIR='${DESTDIR}${localstatedir}' \ - AC_DATAROOTDIR='${DESTDIR}${datarootdir}' \ + AC_LOCALSTATEDIR='${localstatedir}' \ + AC_DATAROOTDIR='${datarootdir}' \ AC_DJANGO_DIR='${DJANGO_DIR}' \ - AC_SYSCONFDIR='${DESTDIR}${sysconfdir}' \ + AC_SYSCONFDIR='${sysconfdir}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/subst-vars.py <$? >$@ rpki-sql-backup: rpki-sql-backup.py |