diff options
-rw-r--r-- | pywrap/Makefile.in | 2 | ||||
-rw-r--r-- | rpkid/portal-gui/Makefile.in | 8 | ||||
-rw-r--r-- | rtr-origin/Makefile.in | 3 | ||||
-rw-r--r-- | utils/find_roa/Makefile.in | 1 | ||||
-rw-r--r-- | utils/hashdir/Makefile.in | 1 | ||||
-rw-r--r-- | utils/print_roa/Makefile.in | 1 | ||||
-rw-r--r-- | utils/print_rpki_manifest/Makefile.in | 1 |
7 files changed, 12 insertions, 5 deletions
diff --git a/pywrap/Makefile.in b/pywrap/Makefile.in index 3e3a475d..3f32a504 100644 --- a/pywrap/Makefile.in +++ b/pywrap/Makefile.in @@ -43,8 +43,8 @@ distclean: clean rm -f Makefile install: all + ${INSTALL} -d ${DESTDIR}${sbindir} ${DESTDIR}${PYWRAP_LIBDIR} ${INSTALL} pywrap ${DESTDIR}${sbindir} - ${INSTALL} -d ${DESTDIR}${PYWRAP_LIBDIR} ${INSTALL} ${PYWRAP_LIBS} ${DESTDIR}${PYWRAP_LIBDIR} deinstall uninstall: diff --git a/rpkid/portal-gui/Makefile.in b/rpkid/portal-gui/Makefile.in index 73993926..8b4e498b 100644 --- a/rpkid/portal-gui/Makefile.in +++ b/rpkid/portal-gui/Makefile.in @@ -18,6 +18,8 @@ libexecdir=@libexecdir@ WEBUSER=@WEBUSER@ DJANGO_ADMIN=@DJANGO_ADMIN@ +INSTALL = @INSTALL@ + CONFDIR=${DESTDIR}$(localstatedir)/rpki/conf DATABASE_PATH=${DESTDIR}$(localstatedir)/rpki/gui.db INSTDIR=${DESTDIR}$(datarootdir)/rpki/gui @@ -50,9 +52,9 @@ install-perms: chown -R $(WEBUSER) $(CONFDIR) install-apache: - install -d -m 755 $(INSTDIR)/apache - install -m 644 apache/rpki.conf $(INSTDIR)/apache - install -m 644 apache/rpki.wsgi $(INSTDIR)/apache + ${INSTALL} -d -m 755 $(INSTDIR)/apache + ${INSTALL} -m 644 apache/rpki.conf $(INSTDIR)/apache + ${INSTALL} -m 644 apache/rpki.wsgi $(INSTDIR)/apache install-data: $(BUILD) install-apache mkdir -p `dirname $(DATABASE_PATH)` diff --git a/rtr-origin/Makefile.in b/rtr-origin/Makefile.in index f498fd89..6b496595 100644 --- a/rtr-origin/Makefile.in +++ b/rtr-origin/Makefile.in @@ -4,7 +4,7 @@ BASE = rtr-origin SRC = ${BASE}.py BIN = ${BASE} -INSTALL = @INSTALL@ -m 555 +INSTALL = @INSTALL@ -m 555 PYTHON = @PYTHON@ prefix = @prefix@ @@ -28,6 +28,7 @@ clean: rm -f ${BIN} install: all + ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL} ${BIN} ${DESTDIR}${bindir}/${BIN} deinstall uninstall: diff --git a/utils/find_roa/Makefile.in b/utils/find_roa/Makefile.in index 9fc160a4..50fbf44f 100644 --- a/utils/find_roa/Makefile.in +++ b/utils/find_roa/Makefile.in @@ -43,6 +43,7 @@ test: ${BIN} sh ./test_roa.sh ${TEST_ARGS} install: all + ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL} ${BIN} ${DESTDIR}${bindir} deinstall uninstall: diff --git a/utils/hashdir/Makefile.in b/utils/hashdir/Makefile.in index 6c5d4d4b..9cf060ff 100644 --- a/utils/hashdir/Makefile.in +++ b/utils/hashdir/Makefile.in @@ -45,6 +45,7 @@ clean:: rm -rf ${OUTPUT} install: all + ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL} ${BIN} ${DESTDIR}${bindir} deinstall uninstall: diff --git a/utils/print_roa/Makefile.in b/utils/print_roa/Makefile.in index 2099b04e..d93702d7 100644 --- a/utils/print_roa/Makefile.in +++ b/utils/print_roa/Makefile.in @@ -42,6 +42,7 @@ test: all if test -d ${ROA_DIR}; then find ${ROA_DIR} -type f -name '*.roa' -print -exec ./${BIN} {} \; ; else :; fi install: all + ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL} ${BIN} ${DESTDIR}${bindir} deinstall uninstall: diff --git a/utils/print_rpki_manifest/Makefile.in b/utils/print_rpki_manifest/Makefile.in index cc4efd97..ace3391f 100644 --- a/utils/print_rpki_manifest/Makefile.in +++ b/utils/print_rpki_manifest/Makefile.in @@ -42,6 +42,7 @@ test: all if test -d ${MANIFEST_DIR}; then find ${MANIFEST_DIR} -type f -name '*.mnf' -print -exec ./${BIN} {} \; ; else :; fi install: all + ${INSTALL} -d ${DESTDIR}${bindir} ${INSTALL} ${BIN} ${DESTDIR}${bindir} deinstall uninstall: |