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 | |
| parent | 16af2b2dbf24a340d27dc96ca2dc3c49baff5828 (diff) | |
| download | nbb-5aecfefa9ad76b851268410525979cc982fd1b17.tar.gz nbb-5aecfefa9ad76b851268410525979cc982fd1b17.tar.xz nbb-5aecfefa9ad76b851268410525979cc982fd1b17.zip | |
Define, use package-version specific pkgpythondir
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/Makefile-files | 2 | ||||
| -rw-r--r-- | src/nbb.in | 6 |
4 files changed, 19 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 98cfae7..191238c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ -nbblibdir = $(pythondir)/nbblib +pkgpythondir = ${pythondir}/${PACKAGE_TARNAME}-${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR} +nbblibdir = ${pkgpythondir}/nbblib ALL_LOCAL = diff --git a/configure.ac b/configure.ac index 2a3cf36..ffab2c2 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,7 @@ AC_PROG_INSTALL ######################################################################## +AC_ARG_VAR([PYTHON], [python interpreter to use]) AM_PATH_PYTHON([2.4], [:], [AC_MSG_ERROR([nbb does require Python >= 2.4])]) AM_CONDITIONAL([HAVE_PYTHON], [ test "x$PYTHON" != "x:" ]) @@ -64,6 +65,18 @@ AC_PATH_PROG([CMAKE], [cmake], [no]) ######################################################################## +AC_SUBST([PACKAGE_VERSION_MAJOR], [$(echo $PACKAGE_VERSION | cut -d . -f 1)]) +AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR], [$PACKAGE_VERSION_MAJOR], + [Major Version]) +AC_SUBST([PACKAGE_VERSION_MINOR], [$(echo $PACKAGE_VERSION | cut -d . -f 2)]) +AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR], + [Minor Version]) +AC_SUBST([PACKAGE_VERSION_PATCHLEVEL], [$(echo $PACKAGE_VERSION | cut -d . -f 3)]) +AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL], + [Patchlevel Version]) + +######################################################################## + AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([GNUmakefile]) AC_CONFIG_FILES([src/nbblib/package.py:src/nbblib/package.in]) 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 |