summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--unix/Makefile.in10
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b204e6..a898a5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-04 Don Porter <dgp@users.sourceforge.net>
+
+ * unix/Makefile.in: Corrections to `make dist` dependencies to be
+ sure that macosx/configure gets generated whenever it does not exist.
+
2007-09-03 Daniel Steffen <das@users.sourceforge.net>
* generic/ttk/ttkInit.c (Ttk_Init): register ttk in package database
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 7012421..6ed4b07 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.132 2007/08/07 05:07:21 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.133 2007/09/04 18:46:29 dgp Exp $
# Current Tk version; used in various names.
@@ -1503,10 +1503,12 @@ $(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
$(UNIX_DIR)/aclocal.m4
cd $(UNIX_DIR); autoconf
$(UNIX_DIR)/tkConfig.h.in: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
- $(UNIX_DIR)/aclocal.m4 $(MAC_OSX_DIR)/configure.ac
- cd $(MAC_OSX_DIR); autoconf; autoheader; touch $@
+ $(UNIX_DIR)/aclocal.m4 $(MAC_OSX_DIR)/configure
+ cd $(MAC_OSX_DIR); autoheader; touch $@
+$(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac
+ cd $(MAC_OSX_DIR); autoconf
-dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in
+dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(MAC_OSX_DIR)/configure
rm -rf $(DISTDIR)
mkdir -p $(DISTDIR)/unix
cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix