summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2007-04-25 03:40:26 (GMT)
committerdas <das>2007-04-25 03:40:26 (GMT)
commit878b93bf45b4a7326999b5cd61afbe084895a0aa (patch)
treeafb02dbb45bbf178a533a8b47840da1f443f2ccc
parentfaf0f0ef598c5be1f8582ed3f03336b9b389faef (diff)
downloadtcl-878b93bf45b4a7326999b5cd61afbe084895a0aa.zip
tcl-878b93bf45b4a7326999b5cd61afbe084895a0aa.tar.gz
tcl-878b93bf45b4a7326999b5cd61afbe084895a0aa.tar.bz2
* unix/Makefile.in (dist): copy license.terms to dist macosx dir; fix autoheader bits.
-rw-r--r--ChangeLog3
-rw-r--r--unix/Makefile.in36
2 files changed, 21 insertions, 18 deletions
diff --git a/ChangeLog b/ChangeLog
index 8720dc6..f336f0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2007-04-25 Daniel Steffen <das@users.sourceforge.net>
- * unix/Makefile.in (dist): add macosx/*.xcconfig files to src dist.
+ * unix/Makefile.in (dist): add macosx/*.xcconfig files to src dist;
+ copy license.terms to dist macosx dir; fix autoheader bits.
2007-04-24 Miguel Sofer <msofer@users.sf.net>
diff --git a/unix/Makefile.in b/unix/Makefile.in
index c0bfa1e..6622bfb 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.205 2007/04/25 02:49:13 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.206 2007/04/25 03:40:26 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -686,7 +686,7 @@ gendate:
# run (and the results checked) after updating to a new release of libtommath.
gentommath_h:
- $(TCL_EXE) "$(TOP_DIR)/tools/fix_tommath_h.tcl" \
+ $(TCL_EXE) "$(TOOL_DIR)/fix_tommath_h.tcl" \
"$(TOMMATH_DIR)/tommath.h" \
> "$(GENERIC_DIR)/tclTomMath.h"
@@ -1612,8 +1612,9 @@ ZIPNAME = tcl${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
DISTDIR = $(DISTROOT)/$(DISTNAME)
$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4
cd $(UNIX_DIR); autoconf
-$(UNIX_DIR)/tclConfig.h.in: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4
- cd $(UNIX_DIR); autoheader
+$(UNIX_DIR)/tclConfig.h.in: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
+ $(MAC_OSX_DIR)/configure.ac
+ cd $(MAC_OSX_DIR); autoconf; autoheader; touch $@
dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in
rm -rf $(DISTDIR)
@@ -1658,8 +1659,8 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in
cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
$(TOP_DIR)/doc/man.macros $(DISTDIR)/doc
mkdir $(DISTDIR)/compat
- cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/compat/*.[ch] \
- $(TOP_DIR)/compat/README $(DISTDIR)/compat
+ cp -p $(TOP_DIR)/license.terms $(COMPAT_DIR)/*.[ch] \
+ $(COMPAT_DIR)/README $(DISTDIR)/compat
mkdir $(DISTDIR)/tests
cp -p $(TOP_DIR)/license.terms $(DISTDIR)/tests
cp -p $(TOP_DIR)/tests/*.test $(TOP_DIR)/tests/README \
@@ -1688,14 +1689,15 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in
cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
mkdir $(DISTDIR)/macosx
- cp -p $(TOP_DIR)/macosx/GNUmakefile $(TOP_DIR)/macosx/README \
- $(TOP_DIR)/macosx/*.c $(TOP_DIR)/macosx/*.in \
- $(TOP_DIR)/macosx/*.ac $(TOP_DIR)/macosx/*.xcconfig \
- $(DISTDIR)/macosx
+ cp -p $(MAC_OSX_DIR)/GNUmakefile $(MAC_OSX_DIR)/README \
+ $(MAC_OSX_DIR)/*.c $(MAC_OSX_DIR)/*.in \
+ $(MAC_OSX_DIR)/*.ac $(MAC_OSX_DIR)/*.xcconfig \
+ $(MAC_OSX_DIR)/configure $(DISTDIR)/macosx
+ cp -p $(TOP_DIR)/license.terms $(DISTDIR)/macosx
mkdir $(DISTDIR)/macosx/Tcl.pbproj
- cp -p $(TOP_DIR)/macosx/Tcl.pbproj/*.pbx* $(DISTDIR)/macosx/Tcl.pbproj
+ cp -p $(MAC_OSX_DIR)/Tcl.pbproj/*.pbx* $(DISTDIR)/macosx/Tcl.pbproj
mkdir $(DISTDIR)/macosx/Tcl.xcode
- cp -p $(TOP_DIR)/macosx/Tcl.xcode/*.pbx* $(DISTDIR)/macosx/Tcl.xcode
+ cp -p $(MAC_OSX_DIR)/Tcl.xcode/*.pbx* $(DISTDIR)/macosx/Tcl.xcode
mkdir $(DISTDIR)/macosx/Tcl.xcodeproj
cp -p $(TOP_DIR)/macosx/Tcl.xcodeproj/*.pbx* $(DISTDIR)/macosx/Tcl.xcodeproj
mkdir $(DISTDIR)/unix/dltest
@@ -1703,11 +1705,11 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in
$(UNIX_DIR)/dltest/README \
$(DISTDIR)/unix/dltest
mkdir $(DISTDIR)/tools
- cp -p $(TOP_DIR)/tools/Makefile.in $(TOP_DIR)/tools/README \
- $(TOP_DIR)/tools/configure $(TOP_DIR)/tools/configure.in \
- $(TOP_DIR)/tools/*.tcl $(TOP_DIR)/tools/man2tcl.c \
- $(TOP_DIR)/tools/tcl.wse.in $(TOP_DIR)/tools/*.bmp \
- $(TOP_DIR)/tools/tcl.hpj.in \
+ cp -p $(TOOL_DIR)/Makefile.in $(TOOL_DIR)/README \
+ $(TOOL_DIR)/configure $(TOOL_DIR)/configure.in \
+ $(TOOL_DIR)/*.tcl $(TOOL_DIR)/man2tcl.c \
+ $(TOOL_DIR)/tcl.wse.in $(TOOL_DIR)/*.bmp \
+ $(TOOL_DIR)/tcl.hpj.in \
$(DISTDIR)/tools
$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/tools/tcl.hpj.in \
$(DISTDIR)/tools/tcl.wse.in