summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2014-07-23 13:10:34 (GMT)
committerdgp <dgp@users.sourceforge.net>2014-07-23 13:10:34 (GMT)
commit40da2e77b5aa89aae9a3324e40f45f8061208f08 (patch)
treebdfb727ba03b2633fe1e7006aa2358ad4ceb393d
parentd59315b818150c8cb704ebd55ca0abf30c524788 (diff)
downloadtcl-40da2e77b5aa89aae9a3324e40f45f8061208f08.zip
tcl-40da2e77b5aa89aae9a3324e40f45f8061208f08.tar.gz
tcl-40da2e77b5aa89aae9a3324e40f45f8061208f08.tar.bz2
Revert the EOLFIX changes of checkin [a803608ed5] (2013-10-28).
They do not work on the one machine where they must -- the release managers! Appears that the NATIVE_TCLSH support isn't found on the 8.5 branch, so we shouldn't expect to use it.
-rw-r--r--unix/Makefile.in15
1 files changed, 7 insertions, 8 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 1738570..d3b810c 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1660,7 +1660,6 @@ $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
$(UNIX_DIR)/tclConfig.h.in: $(MAC_OSX_DIR)/configure
cd $(MAC_OSX_DIR); autoheader; touch $@
-EOLFIX=$(NATIVE_TCLSH) $(TOOL_DIR)/eolFix.tcl
dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(MAC_OSX_DIR)/configure genstubs
rm -rf $(DISTDIR)
mkdir -p $(DISTDIR)/unix
@@ -1720,17 +1719,17 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.ico $(TOP_DIR)/win/*.rc \
$(DISTDIR)/win
cp -p $(TOP_DIR)/win/*.bat $(DISTDIR)/win
- @$(EOLFIX) -crlf $(DISTDIR)/win/*.bat
+ @$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/*.bat
cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win
- @$(EOLFIX) -crlf $(DISTDIR)/win/makefile.bc $(DISTDIR)/win/makefile.vc
+ @$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/makefile.bc $(DISTDIR)/win/makefile.vc
cp -p $(TOP_DIR)/win/rules.vc $(DISTDIR)/win
- @$(EOLFIX) -crlf $(DISTDIR)/win/rules.vc
+ @$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/rules.vc
cp -p $(TOP_DIR)/win/coffbase.txt $(DISTDIR)/win
- @$(EOLFIX) -crlf $(DISTDIR)/win/coffbase.txt
+ @$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/coffbase.txt
cp -p $(TOP_DIR)/win/tcl.hpj.in $(DISTDIR)/win
- @$(EOLFIX) -crlf $(DISTDIR)/win/tcl.hpj.in
+ @$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/tcl.hpj.in
cp -p $(TOP_DIR)/win/tcl.ds* $(DISTDIR)/win
- @$(EOLFIX) -crlf $(DISTDIR)/win/tcl.ds*
+ @$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/win/tcl.ds*
cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
@mkdir $(DISTDIR)/macosx
@@ -1756,7 +1755,7 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
$(TOOL_DIR)/tcl.wse.in $(TOOL_DIR)/*.bmp \
$(TOOL_DIR)/tcl.hpj.in \
$(DISTDIR)/tools
- @$(EOLFIX)-crlf $(DISTDIR)/tools/tcl.hpj.in \
+ @$(TCL_EXE) $(TOOL_DIR)/eolFix.tcl -crlf $(DISTDIR)/tools/tcl.hpj.in \
$(DISTDIR)/tools/tcl.wse.in
@mkdir $(DISTDIR)/libtommath
cp -p $(TOMMATH_SRCS) $(TOMMATH_DIR)/*.h \