Revision: 2249
http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2249&view=rev
Author: dermoth
Date: 2009-09-25 09:34:10 +0000 (Fri, 25 Sep 2009)
Log Message:
-----------
Allow custom versions with the release file...
From: nagiosplugins <[email protected]>
Modified Paths:
--------------
nagiosplug/trunk/configure.in
nagiosplug/trunk/plugins/Makefile.am
nagiosplug/trunk/plugins-root/Makefile.am
nagiosplug/trunk/plugins-scripts/Makefile.am
Modified: nagiosplug/trunk/configure.in
===================================================================
--- nagiosplug/trunk/configure.in 2009-09-24 09:43:06 UTC (rev 2248)
+++ nagiosplug/trunk/configure.in 2009-09-25 09:34:10 UTC (rev 2249)
@@ -101,6 +101,14 @@
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)
Modified: nagiosplug/trunk/plugins/Makefile.am
===================================================================
--- nagiosplug/trunk/plugins/Makefile.am 2009-09-24 09:43:06 UTC (rev 2248)
+++ nagiosplug/trunk/plugins/Makefile.am 2009-09-25 09:34:10 UTC (rev 2249)
@@ -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
Modified: nagiosplug/trunk/plugins-root/Makefile.am
===================================================================
--- nagiosplug/trunk/plugins-root/Makefile.am 2009-09-24 09:43:06 UTC (rev 2248)
+++ nagiosplug/trunk/plugins-root/Makefile.am 2009-09-25 09:34:10 UTC (rev 2249)
@@ -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
Modified: nagiosplug/trunk/plugins-scripts/Makefile.am
===================================================================
--- nagiosplug/trunk/plugins-scripts/Makefile.am 2009-09-24 09:43:06 UTC (rev 2248)
+++ nagiosplug/trunk/plugins-scripts/Makefile.am 2009-09-25 09:34:10 UTC (rev 2249)
@@ -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
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.