[PATCH] fix datarootdir warnings by autoconf 2.61

[Hendrik Baecker]

After upgrading from autoconf 2.59 to 2.61 a new
option was givven: --datarootdir
The datarootdir replaces the old htmldir/datadir in
subst.in and Makefile.in files.

This patch fixes some minor makefile cleanups for the new t-tap
directory. A 'make distclean' will result in a really clean
directory.
---
 Makefile.in        |    5 ++++-
 base/Makefile.in   |    2 +-
 cgi/Makefile.in    |    2 +-
 common/Makefile.in |    2 +-
 html/Makefile.in   |    2 +-
 subst.in           |    2 +-
 t-tap/Makefile.in  |    2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 52ed89a..226fbb7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,6 +14,7 @@ SRC_INCLUDE=@srcdir@/include
 SRC_COMMON=@srcdir@/common
 SRC_XDATA=@srcdir@/xdata
 SRC_CONTRIB=@srcdir@/contrib
+SRC_TTAP=@srcdir@/t-tap
 
 CC=@CC@
 CFLAGS=@CFLAGS@ @DEFS@
@@ -27,7 +28,7 @@ CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
 LIBEXECDIR=@libexecdir@
-HTMLDIR=@datadir@
+HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@
@@ -152,6 +153,7 @@ clean:
 	cd $(SRC_INCLUDE) && $(MAKE) $@
 	cd $(SRC_CONTRIB) && $(MAKE) $@
 	cd $(SRC_MODULE) && $(MAKE) $@
+	cd $(SRC_TTAP) && $(MAKE) $@
 	rm -f *.cfg core
 	rm -f *~ *.*~ */*~ */*.*~ */*/*.*~
 
@@ -164,6 +166,7 @@ distclean: clean
 	cd $(SRC_INCLUDE) && $(MAKE) $@
 	cd $(SRC_CONTRIB) && $(MAKE) $@
 	cd $(SRC_MODULE) && $(MAKE) $@
+	cd $(SRC_TTAP) && $(MAKE) $@
 	rm -f sample-config/*.cfg  sample-config/*.conf sample-config/template-object/*.cfg
 	rm -f daemon-init pkginfo
 	rm -f Makefile subst
diff --git a/base/Makefile.in b/base/Makefile.in
index ea9167b..c4a20ba 100644
--- a/base/Makefile.in
+++ b/base/Makefile.in
@@ -37,7 +37,7 @@ LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
-HTMLDIR=@datadir@
+HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@
diff --git a/cgi/Makefile.in b/cgi/Makefile.in
index 6e9da20..e76a04a 100644
--- a/cgi/Makefile.in
+++ b/cgi/Makefile.in
@@ -16,7 +16,7 @@ LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
-HTMLDIR=@datadir@
+HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@
diff --git a/common/Makefile.in b/common/Makefile.in
index cd7ea75..b0d74f6 100644
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -18,7 +18,7 @@ LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
-HTMLDIR=@datadir@
+HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@
diff --git a/html/Makefile.in b/html/Makefile.in
index 36d6c81..c7fb4dc 100644
--- a/html/Makefile.in
+++ b/html/Makefile.in
@@ -8,7 +8,7 @@ LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
-HTMLDIR=@datadir@
+HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@
diff --git a/subst.in b/subst.in
index a8e2c06..6ad21a9 100755
--- a/subst.in
+++ b/subst.in
@@ -28,7 +28,7 @@ while ($f = shift @ARGV) {
 		s|\@sysconfdir\@|@sysconfdir@|g;
 		s|\@TMPDIR\@|@TMPDIR@|g;
 		s|\@CHECKRESULTDIR\@|@CHECKRESULTDIR@|g;
-		s|\@datadir\@|@datadir@|g;
+		s|\@datadir\@|@datarootdir@|g;
 		s|\@sbindir\@|@sbindir@|g;
 		s|\@bindir\@|@bindir@|g;
 		s|\@htmurl\@|@htmurl@|g;
diff --git a/t-tap/Makefile.in b/t-tap/Makefile.in
index 9ceae92..05593bf 100644
--- a/t-tap/Makefile.in
+++ b/t-tap/Makefile.in
@@ -22,7 +22,7 @@ LOGDIR=@localstatedir@
 CFGDIR=@sysconfdir@
 BINDIR=@bindir@
 CGIDIR=@sbindir@
-HTMLDIR=@datadir@
+HTMLDIR=@datarootdir@
 INSTALL=@INSTALL@
 INSTALL_OPTS=@INSTALL_OPTS@
 COMMAND_OPTS=@COMMAND_OPTS@
-- 
1.5.6.5


------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT 
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, & 
iPhoneDevCamp as they present alongside digital heavyweights like Barbarian 
Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com