summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-06-04 15:08:07 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-06-04 15:08:07 (GMT)
commit36c0df3a148a408836609e5cffafc4baefaaf2c6 (patch)
treed9a3e046c42e679189ac66327409477d07f7f761
parent818230b426123eff7f0abcfc49f2a28f095fde3b (diff)
downloadtcl-36c0df3a148a408836609e5cffafc4baefaaf2c6.zip
tcl-36c0df3a148a408836609e5cffafc4baefaaf2c6.tar.gz
tcl-36c0df3a148a408836609e5cffafc4baefaaf2c6.tar.bz2
merge updates from HEAD
-rw-r--r--ChangeLog4
-rw-r--r--unix/Makefile.in3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 682fef4..59edfdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-03 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/Makefile.in: add datarootdir to silence autoconf-2.6x warning.
+
2007-05-30 Don Porter <dgp@users.sourceforge.net>
* generic/tclBasic.c: Removed code that dealt with
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 81653cf..122fc29 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.207 2007/04/30 22:57:40 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.207.2.1 2007/06/04 15:08:08 dgp Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -29,6 +29,7 @@ exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
includedir = @includedir@
+datarootdir = @datarootdir@
mandir = @mandir@
# The following definition can be set to non-null for special systems like AFS