diff options
| -rw-r--r-- | configure.in | 8 | ||||
| -rw-r--r-- | plugins-root/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins-scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/Makefile.am | 2 |
4 files changed, 11 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 505af93e..5cc693c2 100644 --- a/configure.in +++ b/configure.in @@ -101,6 +101,14 @@ AC_SUBST(REV_TIMESTAMP) dnl Check if version file is present AM_CONDITIONAL([RELEASE_PRESENT], [test -f release]) +# Also read in the version from it +if test -f release; then + NP_RELEASE="$(<release)" +else + NP_RELEASE="$PACKAGE_VERSION" +fi +AC_SUBST(NP_RELEASE) + dnl Checks for programs. AC_PATH_PROG(PYTHON,python) AC_PATH_PROG(SH,sh) diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index dcab4cc7..21840535 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in if RELEASE_PRESENT -NP_VERSION = $(PACKAGE_VERSION) +NP_VERSION = @NP_RELEASE@ else NP-VERSION-FILE: .FORCE-NP-VERSION-FILE @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am index d1ea3c41..58db0604 100644 --- a/plugins-scripts/Makefile.am +++ b/plugins-scripts/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in if RELEASE_PRESENT -NP_VERSION = $(PACKAGE_VERSION) +NP_VERSION = @NP_RELEASE@ else NP-VERSION-FILE: .FORCE-NP-VERSION-FILE @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 37de7536..4570fb7a 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in if RELEASE_PRESENT -NP_VERSION = $(PACKAGE_VERSION) +NP_VERSION = @NP_RELEASE@ else NP-VERSION-FILE: .FORCE-NP-VERSION-FILE @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN |