--- rrdtool-1.2.30/doc/Makefile.am	2009-01-19 15:29:14.000000000 +0100
+++ src/doc/Makefile.am	2012-03-22 13:27:25.589644246 +0100
@@ -38,7 +38,13 @@
 .src.pod:
 	perl -n -e 'if (/^=include\s+(\S+)/){open F,"$$1.inc" || die $$?;print <F>; close F} else {print}'  $<  > $@
 
-.pod.1 .pm.1 .pl.1:
+.pod.1:
+	pod2man --release=$(VERSION) --center=rrdtool $<  > $@
+
+.pm.1:
+	pod2man --release=$(VERSION) --center=rrdtool $<  > $@
+
+.pl.1:
 	pod2man --release=$(VERSION) --center=rrdtool $<  > $@
 
 .1.txt:
@@ -47,7 +53,13 @@
 .1.pdf:
 	@TROFF@ -man $< | ps2pdf - $@
 
-.pm.html .pod.html .pl.html:
+.pm.html:
+	pod2html --infile=$< --outfile=$@ --noindex --htmlroot=. --podpath=. --title=$*
+
+.pod.html:
+	pod2html --infile=$< --outfile=$@ --noindex --htmlroot=. --podpath=. --title=$*
+
+.pl.html:
 	pod2html --infile=$< --outfile=$@ --noindex --htmlroot=. --podpath=. --title=$*
 
 RRDs.pod:
--- rrdtool-1.2.30/bindings/tcl/Makefile.am	2009-01-19 15:29:14.000000000 +0100
+++ src/bindings/tcl/Makefile.am	2012-03-22 13:28:55.103292833 +0100
@@ -25,9 +25,6 @@
 tclpkgdir = @TCL_PACKAGE_DIR@
 tclpkg_DATA = pkgIndex.tcl
 tclpkg_SCRIPTS = ifOctets.tcl
-else
-pkglib_DATA = pkgIndex.tcl
-pkglib_SCRIPTS = ifOctets.tcl
 endif
 
 # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as