diff options
Diffstat (limited to 'rp/rtr-origin')
| -rw-r--r-- | rp/rtr-origin/Makefile.in | 18 | ||||
| -rwxr-xr-x | rp/rtr-origin/rtr-origin | 4 |
2 files changed, 5 insertions, 17 deletions
diff --git a/rp/rtr-origin/Makefile.in b/rp/rtr-origin/Makefile.in index daa18009..e587305b 100644 --- a/rp/rtr-origin/Makefile.in +++ b/rp/rtr-origin/Makefile.in @@ -1,8 +1,6 @@ # $Id$ -BASE = rtr-origin -SRC = ${BASE}.py -BIN = ${BASE} +BIN = rtr-origin INSTALL = @INSTALL@ PYTHON = @PYTHON@ @@ -30,10 +28,8 @@ RPKI_RTR_PORT = 43779 SCAN_ROAS = ${bindir}/scan_roas -all: ${BIN} - -clean: - rm -f ${BIN} +all clean test:: + @true install: all ${RTR_ORIGIN_INSTALL_TARGETS} @@ -48,14 +44,6 @@ distclean: clean rm -rf current sockets *.ax *.ix.* rm -f Makefile -${BIN} : ${SRC} - AC_PYTHON_INTERPRETER='${PYTHON}' AC_SCAN_ROAS='${SCAN_ROAS}' \ - ${PYTHON} ${abs_top_srcdir}/buildtools/make-rcynic-script.py <${SRC} >$@ - chmod a+x $@ - -test: - @true - .FORCE: # Platform-specific rules below here. diff --git a/rp/rtr-origin/rtr-origin b/rp/rtr-origin/rtr-origin index f37d2ce0..e1e82ccf 100755 --- a/rp/rtr-origin/rtr-origin +++ b/rp/rtr-origin/rtr-origin @@ -2163,7 +2163,7 @@ def bgpdump_server_main(argv): # Figure out where the scan_roas utility program is today try: # Set from autoconf - scan_roas = ac_scan_roas + scan_roas = rpki.autoconf.scan_roas except NameError: # Source directory scan_roas = os.path.normpath(os.path.join(sys.path[0], "..", "utils", @@ -2175,7 +2175,7 @@ if not os.path.exists(scan_roas): # Same thing for scan_routercerts try: # Set from autoconf - scan_routercerts = ac_scan_routercerts + scan_routercerts = rpki.autoconf.scan_routercerts except NameError: # Source directory scan_routercerts = os.path.normpath(os.path.join(sys.path[0], "..", "utils", |