diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2008-07-01 04:41:05 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2008-07-15 12:28:55 +0200 |
| commit | 5aecfefa9ad76b851268410525979cc982fd1b17 (patch) | |
| tree | 6f9f140b03d7f8af8a8bef450169ac129d65fc41 /src | |
| parent | 16af2b2dbf24a340d27dc96ca2dc3c49baff5828 (diff) | |
| download | nbb-5aecfefa9ad76b851268410525979cc982fd1b17.tar.gz nbb-5aecfefa9ad76b851268410525979cc982fd1b17.tar.xz nbb-5aecfefa9ad76b851268410525979cc982fd1b17.zip | |
Define, use package-version specific pkgpythondir
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile-files | 2 | ||||
| -rw-r--r-- | src/nbb.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile-files b/src/Makefile-files index d20c1a5..7336739 100644 --- a/src/Makefile-files +++ b/src/Makefile-files @@ -77,7 +77,7 @@ CLEANFILES += src/nbb EXTRA_DIST += src/nbb.in src/nbb: src/nbb.in $(nodist_nbblib_PYTHON) $(nbblib_PYTHON) Makefile $(SED) \ - -e 's&[@]pythondir@&$(pythondir)&g' \ + -e 's&[@]pkgpythondir@&$(pkgpythondir)&g' \ -e 's&[@]PYTHON@&$(PYTHON)&g' \ -e 's&[@]PACKAGE_VERSION@&$(PACKAGE_VERSION)&g' \ < $(srcdir)/src/nbb.in > src/nbb.new @@ -29,15 +29,15 @@ if False: logging.error("xxx error") if __name__ == '__main__': - pythondir = "@pythondir@" + pkgpythondir = "@pkgpythondir@" lib_found = False - #print "pythondir", pythondir + #print "pkgpythondir", pkgpythondir #print "sys.path", sys.path sys.stdout.flush() orig_path = sys.path for cond, path in [ (True, orig_path), - (os.path.exists(pythondir), [pythondir] + orig_path), + (os.path.exists(pkgpythondir), [pkgpythondir] + orig_path), ]: if cond: sys.path = path |