summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-09-04 19:21:24 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-09-04 19:21:24 (GMT)
commitc459c78beb52433cf6d5ab27637be3f7d44b10bc (patch)
treee0d2d858175a46d01e8052d0c0bc9d28064a75dc
parent754b68f4a36cfaf5571565a3459caee4b4cd5387 (diff)
downloadtk-c459c78beb52433cf6d5ab27637be3f7d44b10bc.zip
tk-c459c78beb52433cf6d5ab27637be3f7d44b10bc.tar.gz
tk-c459c78beb52433cf6d5ab27637be3f7d44b10bc.tar.bz2
merge updates from HEAD
-rw-r--r--ChangeLog4
-rw-r--r--unix/Makefile.in4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0560f43..e272f9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-09-04 Don Porter <dgp@users.sourceforge.net>
+ * unix/Makefile.in: It's unreliable to count on the release
+ manager to remember to `make genstubs` before `make dist`. Let the
+ Makefile remember the dependency for us.
+
* unix/Makefile.in: Corrections to `make dist` dependencies to be
sure that macosx/configure gets generated whenever it does not exist.
diff --git a/unix/Makefile.in b/unix/Makefile.in
index e7acfe0..84f0582 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.128.2.5 2007/09/04 18:48:13 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.128.2.6 2007/09/04 19:21:24 dgp Exp $
# Current Tk version; used in various names.
@@ -1508,7 +1508,7 @@ $(UNIX_DIR)/tkConfig.h.in: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
$(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac
cd $(MAC_OSX_DIR); autoconf
-dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(MAC_OSX_DIR)/configure
+dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(MAC_OSX_DIR)/configure genstubs
rm -rf $(DISTDIR)
mkdir -p $(DISTDIR)/unix
cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix