Use rpki.autoconf instead of whacky generated script headers. More

cleanup along these lines still to be done, but this is a start.

svn path=/trunk/; revision=5257

1 files changed, 6 insertions, 18 deletions

diff --git a/buildtools/make-python-executable.py b/buildtools/make-python-executable.py
index eeb31e39..5dc848f4 100644
--- a/buildtools/make-python-executable.py
+++ b/buildtools/make-python-executable.py
@@ -1,11 +1,11 @@
 """
-Convert a Python script into an executable Python script.  Mostly this
-means constructing a header based on a few parameters supplied by
-autoconf.
+Convert a Python script into an executable Python script.  This used
+to do something more complicated, at this point it just adds the
+shebang line.
 
 $Id$
 
-Copyright (C) 2011  Internet Systems Consortium ("ISC")
+Copyright (C) 2011-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
@@ -20,19 +20,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 """
 
-import os, sys
-
-sys.stdout.write('''\
-#!%(AC_PYTHON_INTERPRETER)s
-# Automatically constructed script header
-
-# Set location of global rpki.conf file
-if __name__ == "__main__":
-  import rpki.config
-  rpki.config.default_dirname = "%(AC_RPKI_CONFIG_DIR)s"
-
-# Original script starts here
-
-''' % os.environ)
+import sys
 
+sys.stdout.write("#!%s\n" % sys.executable)
 sys.stdout.write(sys.stdin.read())