summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das@noemail.net>2003-07-23 15:40:39 (GMT)
committerdas <das@noemail.net>2003-07-23 15:40:39 (GMT)
commita3a8de7d451bde4f3bd746bcca7ce52e5ea838b3 (patch)
tree469185036179df4549632e51cfafbd98d0400d47
parent32740b9b523ec10780b4ce7a2f753c464bd87365 (diff)
downloadtcl-a3a8de7d451bde4f3bd746bcca7ce52e5ea838b3.zip
tcl-a3a8de7d451bde4f3bd746bcca7ce52e5ea838b3.tar.gz
tcl-a3a8de7d451bde4f3bd746bcca7ce52e5ea838b3.tar.bz2
* unix/Makefile.in: changes to html-tcl & html-tk
targets for compatibility with non-gnu makes. FossilOrigin-Name: ac8f0f4e4fed8b927c3efcacf15526df95b81033
-rw-r--r--ChangeLog3
-rw-r--r--unix/Makefile.in14
2 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d4666c0..2a309c6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2003-07-23 Daniel Steffen <das@users.sourceforge.net>
+ * unix/Makefile.in: changes to html-tcl & html-tk
+ targets for compatibility with non-gnu makes.
+
* unix/Makefile.in: added macosx/README to dist target.
2003-07-23 Pat Thoyts <patthoyts@users.sourceforge.net>
diff --git a/unix/Makefile.in b/unix/Makefile.in
index bbcf604..1da4b77 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.121.2.3 2003/07/23 05:53:58 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.121.2.4 2003/07/23 15:40:39 das Exp $
VERSION = @TCL_VERSION@
MAJOR_VERSION = @TCL_MAJOR_VERSION@
@@ -1344,12 +1344,16 @@ allpatch: dist
# TOOL_DIR.
#
-html-tcl: EXTRA_HTML_ARGS=--tcl
-html-tk: EXTRA_HTML_ARGS=--tk
+html:
+ $(BUILD_HTML)
+html-tcl:
+ $(BUILD_HTML) --tcl
+html-tk:
+ $(BUILD_HTML) --tk
-html html-tcl html-tk:
+BUILD_HTML = \
$(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(DISTDIR)/html \
- --srcdir=$(TOP_DIR)/.. $(EXTRA_HTML_ARGS)
+ --srcdir=$(TOP_DIR)/..
#
# Target to create a Macintosh version of the distribution. This will