From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 10 Aug 2015 14:48:45 +0000 (+0200)
Subject: make sure rrdbuild does not have to be rebuilt on the install host ... fix for #656
X-Git-Tag: v1.6.0~25^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c62597571055796c24ee3dd91dbb30d870bb6ee8;p=thirdparty%2Frrdtool-1.x.git

make sure rrdbuild does not have to be rebuilt on the install host ... fix for #656
---

diff --git a/Makefile.am b/Makefile.am
index f537bf9e..f45975ca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,10 +62,13 @@ indent:
 clean-local:
 	-rm -f config.h bindings/perl-piped/Makefile.old bindings/perl-shared/Makefile.old
 
+
+
 dist-hook: VERSION
 	$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e 's/^\$VERSION.+/\$VERSION='$(NUM_VERS)';/' bindings/perl-*/*.pm
 	$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e 's/RRDtool 1.GIT, Copyright by Tobi Oetiker/RRDtool '$(PACKAGE_VERSION)', Copyright 1997-'`date +%Y`' by Tobi Oetiker/' src/*.h src/*.c
 	$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e 's/^Version:.+/Version: '$(PACKAGE_VERSION)'/' rrdtool.spec
-	$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e 's/rrdtool-[\.\d]+\d(-[a-z0-9]+)?/rrdtool-'$(PACKAGE_VERSION)'/g' doc/rrdbuild.pod
+	$(AM_V_GEN)$(PERL) -i -p -e 's/rrdtool-[\.\d]+\d(-[a-z0-9]+)?/rrdtool-'$(PACKAGE_VERSION)'/g' doc/rrdbuild.pod
+	$(AM_V_GEN)(cd doc && $(MAKE)) && cp -p doc/rrdbuild.* $(distdir)/doc
                 
 ##END##
diff --git a/Makefile.in b/Makefile.in
index ff88c541..f81f6e09 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -987,7 +987,8 @@ dist-hook: VERSION
 	$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e 's/^\$VERSION.+/\$VERSION='$(NUM_VERS)';/' bindings/perl-*/*.pm
 	$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e 's/RRDtool 1.GIT, Copyright by Tobi Oetiker/RRDtool '$(PACKAGE_VERSION)', Copyright 1997-'`date +%Y`' by Tobi Oetiker/' src/*.h src/*.c
 	$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e 's/^Version:.+/Version: '$(PACKAGE_VERSION)'/' rrdtool.spec
-	$(AM_V_GEN)cd $(distdir) && $(PERL) -i -p -e 's/rrdtool-[\.\d]+\d(-[a-z0-9]+)?/rrdtool-'$(PACKAGE_VERSION)'/g' doc/rrdbuild.pod
+	$(AM_V_GEN)$(PERL) -i -p -e 's/rrdtool-[\.\d]+\d(-[a-z0-9]+)?/rrdtool-'$(PACKAGE_VERSION)'/g' doc/rrdbuild.pod
+	$(AM_V_GEN)(cd doc && $(MAKE)) && cp -p doc/rrdbuild.* $(distdir)/doc
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/configure b/configure
index 63afb372..c9fa597e 100755
--- a/configure
+++ b/configure
@@ -2825,10 +2825,10 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-NUMVERS=1.5001
+NUMVERS=1.5005
 
 
-LIBVERS=7:0:3
+LIBVERS=7:5:3
 
 
 # Make sure we can run config.sub.
diff --git a/doc/rrdbuild.pod b/doc/rrdbuild.pod
index b87d0ee8..e4407644 100644
--- a/doc/rrdbuild.pod
+++ b/doc/rrdbuild.pod
@@ -41,7 +41,7 @@ Where you want to install the software.
 Once you have decided. Save the two locations into environment variables.
 
  BUILD_DIR=/tmp/rrdbuild
- INSTALL_DIR=/opt/rrdtool-1.4.3
+ INSTALL_DIR=/opt/rrdtool-1.5.4
 
 
 If your F</tmp> is mounted with the option noexec (RHEL seems todo that) you have to choose
@@ -55,9 +55,9 @@ Now make sure the BUILD_DIR exists and go there:
 Lets first assume you already have all the necessary libraries
 pre-installed. 
 
- wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.3.tar.gz
- gunzip -c rrdtool-1.4.3.tar.gz | tar xf -
- cd rrdtool-1.4.3
+ wget http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.5.4.tar.gz
+ gunzip -c rrdtool-1.5.4.tar.gz | tar xf -
+ cd rrdtool-1.5.4
  ./configure --prefix=$INSTALL_DIR && make && make install
 
 Ok, this was very optimistic. This try will probably have ended with
@@ -345,7 +345,7 @@ because it seems that a fair number of people have ill configured python and
 tcl setups that would prevent RRDtool from building if they are included in
 their current state.
 
- cd $BUILD_DIR/rrdtool-1.4.3
+ cd $BUILD_DIR/rrdtool-1.5.4
  ./configure --prefix=$INSTALL_DIR --disable-tcl --disable-python
  $MAKE clean
  $MAKE