summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorTobi Oetiker <tobi@oetiker.ch>2005-09-05 08:07:45 +0200
committerTobi Oetiker <tobi@oetiker.ch>2005-09-05 08:07:45 +0200
commit48faec3c1f481a0120aa5363c08c531279f23941 (patch)
treec5030dc8d1f4b85c182c68420024e492b595e19c /Makefile
parentf5602215b928f8dd0cc8dee28b4f7bb87307254b (diff)
downloadsmokeping-48faec3c1f481a0120aa5363c08c531279f23941.tar.gz
smokeping-48faec3c1f481a0120aa5363c08c531279f23941.tar.xz
merge with 2.0.1 changes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile15
1 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 6998998..899cf64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,11 @@
SHELL = /bin/sh
-VERSION = 2.0rc5
-NUMVERSION = 1.99006
+VERSION = 2.0.1
+############ A is for features
+############ B is for bugfixes
+############ V.AAABBB
+############ 2.000001
+############ 2.000002
+NUMVERSION = 2.000001
IGNORE = ~|CVS|var/|smokeping-$(VERSION)/smokeping-$(VERSION)|cvsignore|rej|orig|DEAD|pod2htm[di]\.tmp|.svn
GROFF = groff
.PHONY: man html txt ref examples check-examples patch killdoc doc tar rename-man symlinks remove-symlinks
@@ -31,8 +36,8 @@ MAN2TXT = $(GROFF) -man -Tascii $< > $@
# pod2html apparently needs to be in the target directory to get L<> links right
POD2HTML= cd $(dir $@); top="$(shell echo $(dir $@)|sed -e 's,doc/,,' -e 's,[^/]*/,../,g' -e 's,/$$,,')"; top=$${top:-.}; pod2html --infile=$(CURDIR)/$< --noindex --htmlroot=. --podroot=. --podpath=$${top} --title=$* | $${top}/../util/fix-pod2html.pl > $(notdir $@)
# we go to this trouble to ensure that MAKEPOD only uses modules in the installation directory
-MAKEPOD= perl -Ilib -I/usr/pack/rrdtool-1.0.47-to/lib/perl -mSmokeping -e 'Smokeping::main()' -- --makepod
-GENEX= perl -Ilib -I/usr/pack/rrdtool-1.0.47-to/lib/perl -mSmokeping -e 'Smokeping::main()' -- --gen-examples
+MAKEPOD= perl -I/home/oetiker/lib/fake-perl/ -Ilib -I/usr/pack/rrdtool-1.2svn-to/lib/perl -mSmokeping -e 'Smokeping::main()' -- --makepod
+GENEX= perl -I/home/oetiker/lib/fake-perl/ -Ilib -I/usr/pack/rrdtool-1.2svn-to/lib/perl -mSmokeping -e 'Smokeping::main()' -- --gen-examples
doc/%.7: doc/%.pod
$(POD2MAN) --section 7 > $@
@@ -100,7 +105,7 @@ txt: $(TXT)
rename-man: $(MAN)
for j in probes matchers; do \
for i in doc/Smokeping/$$j/*.3; do \
- if ! echo $$i | grep -q Smokeping::$$j; then \
+ if echo $$i | grep Smokeping::$$j>/dev/null; then :; else \
mv $$i `echo $$i | sed s,$$j/,$$j/Smokeping::$$j::,`; \
fi; \
done; \