diff options
| author | Rob Austein <sra@hactrn.net> | 2014-04-14 15:40:52 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2014-04-14 15:40:52 +0000 |
| commit | 1917be8bbd3fdcc84bd212f7b799bed8c80ca9e1 (patch) | |
| tree | cf43547e51629e77497ef7509ddbb84fa4cd65e4 /rp/rpki-rtr | |
| parent | 909009f54b1cfa93400aaade55ef583fe820dd34 (diff) | |
Move all Python script installation to setup.py, so that it gets the
name of the Python executable right (FreeBSD $PATH under cron problem,
again, yet another variant). See #686.
svn path=/trunk/; revision=5792
Diffstat (limited to 'rp/rpki-rtr')
| -rw-r--r-- | rp/rpki-rtr/Makefile.in | 12 | ||||
| -rw-r--r-- | rp/rpki-rtr/rules.darwin.mk | 2 | ||||
| -rw-r--r-- | rp/rpki-rtr/rules.freebsd.mk | 2 | ||||
| -rw-r--r-- | rp/rpki-rtr/rules.linux.mk | 2 | ||||
| -rw-r--r-- | rp/rpki-rtr/rules.unknown.mk | 2 |
5 files changed, 5 insertions, 15 deletions
diff --git a/rp/rpki-rtr/Makefile.in b/rp/rpki-rtr/Makefile.in index e587305b..11b493f0 100644 --- a/rp/rpki-rtr/Makefile.in +++ b/rp/rpki-rtr/Makefile.in @@ -25,21 +25,11 @@ RTR_ORIGIN_INSTALL_TARGETS = @RCYNIC_INSTALL_TARGETS@ RPKI_RTR_PORT = 43779 -SCAN_ROAS = ${bindir}/scan_roas - - -all clean test:: +all clean test deinstall uninstall:: @true install: all ${RTR_ORIGIN_INSTALL_TARGETS} -install-binary: - if test -d ${DESTDIR}${bindir} ; then :; else ${INSTALL} -m 555 -d ${DESTDIR}${bindir}; fi - ${INSTALL} -m 555 ${BIN} ${DESTDIR}${bindir}/${BIN} - -deinstall uninstall: - rm -f ${DESTDIR}${bindir}/${BIN} - distclean: clean rm -rf current sockets *.ax *.ix.* rm -f Makefile diff --git a/rp/rpki-rtr/rules.darwin.mk b/rp/rpki-rtr/rules.darwin.mk index 1230db92..06762bcd 100644 --- a/rp/rpki-rtr/rules.darwin.mk +++ b/rp/rpki-rtr/rules.darwin.mk @@ -1,6 +1,6 @@ # $Id$ -install-always: install-binary +install-always: install-postconf: install-listener diff --git a/rp/rpki-rtr/rules.freebsd.mk b/rp/rpki-rtr/rules.freebsd.mk index df99da47..c58e6332 100644 --- a/rp/rpki-rtr/rules.freebsd.mk +++ b/rp/rpki-rtr/rules.freebsd.mk @@ -1,6 +1,6 @@ # $Id$ -install-always: install-binary +install-always: install-postconf: install-listener diff --git a/rp/rpki-rtr/rules.linux.mk b/rp/rpki-rtr/rules.linux.mk index 23f90f69..51c27b6b 100644 --- a/rp/rpki-rtr/rules.linux.mk +++ b/rp/rpki-rtr/rules.linux.mk @@ -1,6 +1,6 @@ # $Id$ -install-always: install-binary install-listener +install-always: install-listener install-postconf: @true diff --git a/rp/rpki-rtr/rules.unknown.mk b/rp/rpki-rtr/rules.unknown.mk index fb16e93a..a91b7f8d 100644 --- a/rp/rpki-rtr/rules.unknown.mk +++ b/rp/rpki-rtr/rules.unknown.mk @@ -1,6 +1,6 @@ # $Id$ -install-always: install-binary +install-always: install-postconf: install-listener |