diff options
| author | Rob Austein <sra@hactrn.net> | 2013-02-25 03:58:36 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-02-25 03:58:36 +0000 |
| commit | d2bb943731ec492941e367fc9c399a1c9fd89e11 (patch) | |
| tree | a9be1eba3ac2748649a0c78333c9b4165e70e745 /rtr-origin/rtr-origin.py | |
| parent | b033927cf90652a52ce2d71d95a4572527602d8f (diff) | |
| parent | 10408f676d398b1961d24daf360d42f79b8ecfc5 (diff) | |
Merge platform-specific packaging changes back to trunk. Closes #377,
#374, #395, #398. Also see #373, which ended up not being covered by
this branch after all.
svn path=/trunk/; revision=5065
Diffstat (limited to 'rtr-origin/rtr-origin.py')
| -rwxr-xr-x | rtr-origin/rtr-origin.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/rtr-origin/rtr-origin.py b/rtr-origin/rtr-origin.py index 95bef50e..70a0bb1d 100755 --- a/rtr-origin/rtr-origin.py +++ b/rtr-origin/rtr-origin.py @@ -9,7 +9,7 @@ # # $Id$ # -# Copyright (C) 2009-2012 Internet Systems Consortium ("ISC") +# Copyright (C) 2009-2013 Internet Systems Consortium ("ISC") # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -1805,9 +1805,15 @@ def bgpdump_server_main(argv): except KeyboardInterrupt: sys.exit(0) - -scan_roas = os.path.normpath(os.path.join(sys.path[0], "..", "utils", - "scan_roas", "scan_roas")) +# Figure out where the scan_roas utility program is today +try: + # Set from autoconf + scan_roas = ac_scan_roas +except NameError: + # Source directory + scan_roas = os.path.normpath(os.path.join(sys.path[0], "..", "utils", + "scan_roas", "scan_roas")) +# If that didn't work, use $PATH and hope for the best if not os.path.exists(scan_roas): scan_roas = "scan_roas" |