From 6ef867d68cc340f7322e9ae5d29af55900dca69f Mon Sep 17 00:00:00 2001
From: Rob Austein <sra@hactrn.net>
Date: Sat, 2 Feb 2013 19:02:11 +0000
Subject: Wire installed location of scan_roas into installed rtr-origin, so
 that we can stop fighting with FreeBSD's odd habit of installing packaged
 software in /usr/local/bin while excluding /usr/local/bin from the default
 $PATH in system cron jobs and shell scripts.

svn path=/branches/tk377/; revision=5013
---
 rtr-origin/rtr-origin.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'rtr-origin/rtr-origin.py')

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"
 
-- 
cgit v1.2.3