diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2008-02-13 02:33:38 +0100 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2008-02-13 02:33:38 +0100 |
| commit | f3a330021747c412714804266f93b064c2793d2f (patch) | |
| tree | 0231f4b89002c539937bf40923283068b3624f11 | |
| parent | cb4d16327c252206056efe7ab22eb7763354e33e (diff) | |
| download | ndim-git-utils-f3a330021747c412714804266f93b064c2793d2f.tar.gz ndim-git-utils-f3a330021747c412714804266f93b064c2793d2f.tar.xz ndim-git-utils-f3a330021747c412714804266f93b064c2793d2f.zip | |
Have nbb work in non-standard prefixes
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | nbb/Makefile-files | 10 | ||||
| -rw-r--r-- | nbb/nbb.in | 22 | ||||
| -rw-r--r-- | nbb/nbb_lib.in | 2 |
4 files changed, 23 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index c33d584..ac56c71 100644 --- a/configure.ac +++ b/configure.ac @@ -36,7 +36,6 @@ AC_CONFIG_FILES([git-buildmsg/git-buildmsg]) AC_CONFIG_FILES([git-rebase-subtree/git-rebase-subtree]) AC_CONFIG_FILES([git-rebase-subtree/git-rebase-subtree.man]) AC_CONFIG_FILES([git-ndim-sh/git-ndim-sh]) -AC_CONFIG_FILES([nbb/nbb]) AC_CONFIG_FILES([nbb/nbb_lib.py:nbb/nbb_lib.in]) AC_OUTPUT diff --git a/nbb/Makefile-files b/nbb/Makefile-files index c55031e..ac12ab1 100644 --- a/nbb/Makefile-files +++ b/nbb/Makefile-files @@ -3,17 +3,17 @@ if HAVE_PYTHON # For now -AM_INSTALLCHECK_STD_OPTIONS_EXEMPT += nbb/nbb - # TESTS += nbb/nbb bin_SCRIPTS += nbb/nbb EXTRA_DIST += nbb/nbb.in -all-local: nbb/nbb +CLEANFILES += nbb/nbb +nbb/nbb: $(srcdir)/nbb/nbb.in nbb/nbb_lib.py + $(SED) -e "s|[@]PYTHON@|$(PYTHON)|" \ + -e "s|[@]pythondir@|$(pythondir)|" \ + < $(srcdir)/nbb/nbb.in > nbb/nbb chmod +x nbb/nbb -nbb/nbb: nbb/nbb_lib.py - python_PYTHON += nbb/nbb_lib.py endif @@ -1,16 +1,28 @@ #!@PYTHON@ import sys +import os + +def error(): + sys.stderr.write("nbb: Fatal: Could not load nbb_lib.\n") + sys.exit(3) if __name__ == '__main__': try: - #sys.stdout.write("sys.path=%s\n" % repr(sys.path)) - #sys.stdout.flush() import nbb_lib - nbb_lib.main(sys.argv) except ImportError, e: - sys.stderr.write("nbb: Fatal: Could not load nbb_lib.\n") - sys.exit(3) + pythondir = "@pythondir@" + if os.path.exists(pythondir): + try: + sys.path.insert(0, pythondir) + import nbb_lib + except ImportError, e: + error() + else: + error() + #sys.stdout.write("sys.path=%s\n" % repr(sys.path)) + #sys.stdout.flush() + nbb_lib.main(sys.argv) # Local Variables: # mode: python diff --git a/nbb/nbb_lib.in b/nbb/nbb_lib.in index 136b103..2345eb6 100644 --- a/nbb/nbb_lib.in +++ b/nbb/nbb_lib.in @@ -329,7 +329,7 @@ def main(argv): print "Usage: %(prog)s" % locals() return elif opt in ('-V', '--version'): - print "%(prog)s (@PACKAGE_NAME@) @PACKAGE_VERSION@" + print "%(prog)s (@PACKAGE_NAME@) @PACKAGE_VERSION@" % locals() return else: raise NotImplementedError() |