summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.in8
-rw-r--r--plugins-root/Makefile.am2
-rw-r--r--plugins-scripts/Makefile.am2
-rw-r--r--plugins/Makefile.am2
4 files changed, 11 insertions, 3 deletions
diff --git a/configure.in b/configure.in
index 505af93..5cc693c 100644
--- a/configure.in
+++ b/configure.in
@@ -101,6 +101,14 @@ AC_SUBST(REV_TIMESTAMP)
101dnl Check if version file is present 101dnl Check if version file is present
102AM_CONDITIONAL([RELEASE_PRESENT], [test -f release]) 102AM_CONDITIONAL([RELEASE_PRESENT], [test -f release])
103 103
104# Also read in the version from it
105if test -f release; then
106 NP_RELEASE="$(<release)"
107else
108 NP_RELEASE="$PACKAGE_VERSION"
109fi
110AC_SUBST(NP_RELEASE)
111
104dnl Checks for programs. 112dnl Checks for programs.
105AC_PATH_PROG(PYTHON,python) 113AC_PATH_PROG(PYTHON,python)
106AC_PATH_PROG(SH,sh) 114AC_PATH_PROG(SH,sh)
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index dcab4cc..2184053 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -1,7 +1,7 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3if RELEASE_PRESENT 3if RELEASE_PRESENT
4NP_VERSION = $(PACKAGE_VERSION) 4NP_VERSION = @NP_RELEASE@
5else 5else
6NP-VERSION-FILE: .FORCE-NP-VERSION-FILE 6NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
7 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN 7 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
diff --git a/plugins-scripts/Makefile.am b/plugins-scripts/Makefile.am
index d1ea3c4..58db060 100644
--- a/plugins-scripts/Makefile.am
+++ b/plugins-scripts/Makefile.am
@@ -1,7 +1,7 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3if RELEASE_PRESENT 3if RELEASE_PRESENT
4NP_VERSION = $(PACKAGE_VERSION) 4NP_VERSION = @NP_RELEASE@
5else 5else
6NP-VERSION-FILE: .FORCE-NP-VERSION-FILE 6NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
7 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN 7 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 37de753..4570fb7 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,7 +1,7 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3if RELEASE_PRESENT 3if RELEASE_PRESENT
4NP_VERSION = $(PACKAGE_VERSION) 4NP_VERSION = @NP_RELEASE@
5else 5else
6NP-VERSION-FILE: .FORCE-NP-VERSION-FILE 6NP-VERSION-FILE: .FORCE-NP-VERSION-FILE
7 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN 7 @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN