diff options
| author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2008-11-26 05:42:48 -0500 |
|---|---|---|
| committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2008-11-26 05:42:48 -0500 |
| commit | 9bcfa9cdede27be34d11f42dfae3d8fd60fc92bc (patch) | |
| tree | 77f11fd6fb26c9ac4d8a410983629927c70d5319 /plugins-root | |
| parent | ed9a088b37dcb8ba56d397592f4e8230a6a011e5 (diff) | |
| download | monitoring-plugins-9bcfa9cdede27be34d11f42dfae3d8fd60fc92bc.tar.gz | |
Disable dynamic versionning for releases, and allow generating version out of subversion.
This should be a definitive fix for systems with non-compilant make programs as the version will be taken from $(PACKAGE_VERSION) instead.
At the same time I added code for generating svn-based version strings.
Diffstat (limited to 'plugins-root')
| -rw-r--r-- | plugins-root/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am index ba2e9a27..3fb62a24 100644 --- a/plugins-root/Makefile.am +++ b/plugins-root/Makefile.am | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | ## Process this file with automake to produce Makefile.in | 1 | ## Process this file with automake to produce Makefile.in |
| 2 | 2 | ||
| 3 | if RELEASE_PRESENT | ||
| 4 | NP_VERSION = $(PACKAGE_VERSION) | ||
| 5 | else | ||
| 3 | NP-VERSION-FILE: .FORCE-NP-VERSION-FILE | 6 | NP-VERSION-FILE: .FORCE-NP-VERSION-FILE |
| 4 | @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN | 7 | @$(SHELL_PATH) $(top_srcdir)/NP-VERSION-GEN |
| 5 | .FORCE-NP-VERSION-FILE: | 8 | .FORCE-NP-VERSION-FILE: |
| 6 | 9 | -include NP-VERSION-FILE | |
| 7 | ## This is undocumented and could possibly break in future versions of | 10 | endif |
| 8 | ## automake. See: | ||
| 9 | ## http://article.gmane.org/gmane.comp.sysutils.automake.general/10036 | ||
| 10 | @am__include@ @am__quote@NP-VERSION-FILE@am__quote@ | ||
| 11 | 11 | ||
| 12 | AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' | 12 | AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"' |
| 13 | 13 | ||