aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pywrap/Makefile.in8
-rw-r--r--rcynic/Makefile.in4
-rw-r--r--rpkid/Makefile.in16
-rw-r--r--rpkid/portal-gui/Makefile.in8
-rw-r--r--rtr-origin/Makefile.in4
-rw-r--r--utils/find_roa/Makefile.in4
-rw-r--r--utils/hashdir/Makefile.in4
-rw-r--r--utils/print_roa/Makefile.in4
-rw-r--r--utils/print_rpki_manifest/Makefile.in4
9 files changed, 28 insertions, 28 deletions
diff --git a/pywrap/Makefile.in b/pywrap/Makefile.in
index d9a56f15..3e3a475d 100644
--- a/pywrap/Makefile.in
+++ b/pywrap/Makefile.in
@@ -43,9 +43,9 @@ distclean: clean
rm -f Makefile
install: all
- ${INSTALL} pywrap ${sbindir}
- ${INSTALL} -d ${PYWRAP_LIBDIR}
- ${INSTALL} ${PYWRAP_LIBS} ${PYWRAP_LIBDIR}
+ ${INSTALL} pywrap ${DESTDIR}${sbindir}
+ ${INSTALL} -d ${DESTDIR}${PYWRAP_LIBDIR}
+ ${INSTALL} ${PYWRAP_LIBS} ${DESTDIR}${PYWRAP_LIBDIR}
deinstall uninstall:
- rm -rf ${sbindir}/pywrap ${PYWRAP_LIBDIR}
+ rm -rf ${DESTDIR}${sbindir}/pywrap ${DESTDIR}${PYWRAP_LIBDIR}
diff --git a/rcynic/Makefile.in b/rcynic/Makefile.in
index 7406935e..9bf7d38e 100644
--- a/rcynic/Makefile.in
+++ b/rcynic/Makefile.in
@@ -28,10 +28,10 @@ test: ${BIN}
if test -r rcynic.conf; then ./${BIN} -j 0 && echo && ./show.sh; else echo No rcynic.conf, skipping test; fi
install: ${BIN} installation-scripts/install.sh
- cd installation-scripts; host_os="${host_os}"; . ./install.sh
+ cd installation-scripts; host_os="${host_os}"; DESTDIR="${DESTDIR}"; . ./install.sh
uninstall deinstall:
- cd installation-scripts; host_os="${host_os}"; . ./deinstall.sh
+ cd installation-scripts; host_os="${host_os}"; DESTDIR="${DESTDIR}"; . ./deinstall.sh
distclean: clean docclean
cd static-rsync; ${MAKE} $@
diff --git a/rpkid/Makefile.in b/rpkid/Makefile.in
index 5d846063..05a845ff 100644
--- a/rpkid/Makefile.in
+++ b/rpkid/Makefile.in
@@ -32,10 +32,10 @@ SETUP_PY = \
AC_CFLAGS='${CFLAGS}' \
AC_LDFLAGS='${LDFLAGS}' \
AC_LIBS='${LIBS}' \
- AC_SBINDIR='${sbindir}' \
+ AC_SBINDIR='${DESTDIR}${sbindir}' \
AC_SCRIPTS='${SCRIPTS}' \
AC_ABS_BUILDDIR='${abs_builddir}' \
- AC_LIBEXECDIR='${libexecdir}' \
+ AC_LIBEXECDIR='${DESTDIR}${libexecdir}' \
AC_AUX_SCRIPTS='${AUX_SCRIPTS}' \
${PYTHON} setup.py
@@ -91,7 +91,7 @@ uninstall deinstall::
xargs rm -fv <installed
distclean::
- rm -f _installed
+ rm -f installed
dont-run-trang:
touch *.rng
@@ -180,7 +180,7 @@ all install clean test distclean deinstall uninstall::
@for i in ${SUBDIRS}; do echo "Making $@ in $$i"; (cd $$i && ${MAKE} $@); done
COMPILE_COMMON = \
- AC_RPKI_CONFIG_DIR='${sysconfdir}' \
+ AC_RPKI_CONFIG_DIR='${DESTDIR}${sysconfdir}' \
${PYTHON} ${abs_top_srcdir}/buildtools/make-python-executable.py <$? >$@; \
chmod 555 $@
@@ -189,12 +189,12 @@ COMPILE_PYWRAP = rm -f $@; AC_PYTHON_INTERPRETER='${PYWRAP}' ${COMPILE_COMMON}
COMPILE_SETTINGS = \
rm -f $@; \
- AC_DATABASE_PATH='${localstatedir}/rpki/gui.db' \
+ AC_DATABASE_PATH='${DESTDIR}${localstatedir}/rpki/gui.db' \
AC_SECRET_KEY='${SECRET_KEY}' \
- AC_MYRPKI='${sbindir}/myrpki' \
- AC_LOCALSTATEDIR='${localstatedir}' \
+ AC_MYRPKI='${DESTDIR}${sbindir}/myrpki' \
+ AC_LOCALSTATEDIR='${DESTDIR}${localstatedir}' \
AC_WEBUSER='${WEBUSER}' \
- AC_TEMPLATE_DIR='${datarootdir}/rpki/gui/templates' \
+ AC_TEMPLATE_DIR='${DESTDIR}${datarootdir}/rpki/gui/templates' \
${PYTHON} ${abs_top_srcdir}/buildtools/subst-vars.py <$? >$@
rpki-sql-backup: rpki-sql-backup.py
diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in
index 6f841570..73993926 100644
--- a/rpkid/portal-gui/Makefile.in
+++ b/rpkid/portal-gui/Makefile.in
@@ -18,9 +18,9 @@ libexecdir=@libexecdir@
WEBUSER=@WEBUSER@
DJANGO_ADMIN=@DJANGO_ADMIN@
-CONFDIR=$(localstatedir)/rpki/conf
-DATABASE_PATH=$(localstatedir)/rpki/gui.db
-INSTDIR=$(datarootdir)/rpki/gui
+CONFDIR=${DESTDIR}$(localstatedir)/rpki/conf
+DATABASE_PATH=${DESTDIR}$(localstatedir)/rpki/gui.db
+INSTDIR=${DESTDIR}$(datarootdir)/rpki/gui
TEMPLATEDIR=$(INSTDIR)/templates
# automatically built sources
@@ -61,7 +61,7 @@ install-data: $(BUILD) install-apache
install: install-data install-perms
deinstall uninstall:
- rm -r $(INSTDIR)
+ rm -rf $(INSTDIR)
test:
@true
diff --git a/rtr-origin/Makefile.in b/rtr-origin/Makefile.in
index 10565c27..f498fd89 100644
--- a/rtr-origin/Makefile.in
+++ b/rtr-origin/Makefile.in
@@ -28,10 +28,10 @@ clean:
rm -f ${BIN}
install: all
- ${INSTALL} ${BIN} ${bindir}/${BIN}
+ ${INSTALL} ${BIN} ${DESTDIR}${bindir}/${BIN}
deinstall uninstall:
- rm -f ${bindir}/${BIN}
+ rm -f ${DESTDIR}${bindir}/${BIN}
distclean: clean
rm -f Makefile
diff --git a/utils/find_roa/Makefile.in b/utils/find_roa/Makefile.in
index 3c133f97..9fc160a4 100644
--- a/utils/find_roa/Makefile.in
+++ b/utils/find_roa/Makefile.in
@@ -43,10 +43,10 @@ test: ${BIN}
sh ./test_roa.sh ${TEST_ARGS}
install: all
- ${INSTALL} ${BIN} ${bindir}
+ ${INSTALL} ${BIN} ${DESTDIR}${bindir}
deinstall uninstall:
- rm -f ${bindir}/${BIN}
+ rm -f ${DESTDIR}${bindir}/${BIN}
distclean: clean
rm -f Makefile
diff --git a/utils/hashdir/Makefile.in b/utils/hashdir/Makefile.in
index cd564a33..6c5d4d4b 100644
--- a/utils/hashdir/Makefile.in
+++ b/utils/hashdir/Makefile.in
@@ -45,10 +45,10 @@ clean::
rm -rf ${OUTPUT}
install: all
- ${INSTALL} ${BIN} ${bindir}
+ ${INSTALL} ${BIN} ${DESTDIR}${bindir}
deinstall uninstall:
- rm -f ${bindir}/${BIN}
+ rm -f ${DESTDIR}${bindir}/${BIN}
distclean: clean
rm -f Makefile
diff --git a/utils/print_roa/Makefile.in b/utils/print_roa/Makefile.in
index d3d70d7e..2099b04e 100644
--- a/utils/print_roa/Makefile.in
+++ b/utils/print_roa/Makefile.in
@@ -42,10 +42,10 @@ test: all
if test -d ${ROA_DIR}; then find ${ROA_DIR} -type f -name '*.roa' -print -exec ./${BIN} {} \; ; else :; fi
install: all
- ${INSTALL} ${BIN} ${bindir}
+ ${INSTALL} ${BIN} ${DESTDIR}${bindir}
deinstall uninstall:
- rm -f ${bindir}/${BIN}
+ rm -f ${DESTDIR}${bindir}/${BIN}
distclean: clean
rm -f Makefile
diff --git a/utils/print_rpki_manifest/Makefile.in b/utils/print_rpki_manifest/Makefile.in
index 843c9db9..cc4efd97 100644
--- a/utils/print_rpki_manifest/Makefile.in
+++ b/utils/print_rpki_manifest/Makefile.in
@@ -42,10 +42,10 @@ test: all
if test -d ${MANIFEST_DIR}; then find ${MANIFEST_DIR} -type f -name '*.mnf' -print -exec ./${BIN} {} \; ; else :; fi
install: all
- ${INSTALL} ${BIN} ${bindir}
+ ${INSTALL} ${BIN} ${DESTDIR}${bindir}
deinstall uninstall:
- rm -f ${bindir}/${BIN}
+ rm -f ${DESTDIR}${bindir}/${BIN}
distclean: clean
rm -f Makefile