Patchwork [3/5] rrdtool: fix breakage with newer autotools

login
register
mail settings
Submitter Gustavo Zacarias
Date May 11, 2012, 1:33 p.m.
Message ID <1336743239-6368-3-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/158515/
State Accepted
Commit 18771deb3d21d44a766347d1485244dbeb8c7f22
Headers show

Comments

Gustavo Zacarias - May 11, 2012, 1:33 p.m.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/rrdtool/rrdtool-automake-compat.patch      |   18 ++++++++++++++++++
 ...ool-configure-dont-hardcode-include-dirs.patch} |    0
 2 files changed, 18 insertions(+), 0 deletions(-)
 create mode 100644 package/rrdtool/rrdtool-automake-compat.patch
 rename package/rrdtool/{rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch => rrdtool-configure-dont-hardcode-include-dirs.patch} (100%)

diff --git a/package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch b/package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch
similarity index 100%
rename from package/rrdtool/rrdtool-1.2.30-configure-dont-hardcode-include-dirs.patch
rename to package/rrdtool/rrdtool-configure-dont-hardcode-include-dirs.patch

Patch

diff --git a/package/rrdtool/rrdtool-automake-compat.patch b/package/rrdtool/rrdtool-automake-compat.patch
new file mode 100644
index 0000000..92b753d
--- /dev/null
+++ b/package/rrdtool/rrdtool-automake-compat.patch
@@ -0,0 +1,18 @@ 
+Make it compatible with newer autoconf/automake.
+Patch from OpenWRT.
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/bindings/tcl/Makefile.am
++++ b/bindings/tcl/Makefile.am
+@@ -26,8 +26,8 @@ tclpkgdir = @TCL_PACKAGE_DIR@
+ tclpkg_DATA = pkgIndex.tcl
+ tclpkg_SCRIPTS = ifOctets.tcl
+ else
+-pkglib_DATA = pkgIndex.tcl
+-pkglib_SCRIPTS = ifOctets.tcl
++pkgdata_DATA = pkgIndex.tcl
++pkgdata_SCRIPTS = ifOctets.tcl
+ endif
+ 
+ # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as