summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-07-30 06:45:30 (GMT)
committerdas <das>2005-07-30 06:45:30 (GMT)
commitce8d7d22d0f5eb10e00df422dffb587c95481678 (patch)
tree4c2f103c7acca13730caa0041e1b5d03c8dc2580
parent968da56340a28292aaa75a1dd2e1d41e620911a1 (diff)
downloadtk-ce8d7d22d0f5eb10e00df422dffb587c95481678.zip
tk-ce8d7d22d0f5eb10e00df422dffb587c95481678.tar.gz
tk-ce8d7d22d0f5eb10e00df422dffb587c95481678.tar.bz2
* unix/Makefile.in (html): reverted/amended changes of 2005-07-24
that broke TkAqua 'make install'; added BUILD_HTML_FLAGS optional var like in tcl/unix/Makefile.in.
-rw-r--r--ChangeLog6
-rw-r--r--unix/Makefile.in13
2 files changed, 14 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c7772b0..2f28f45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-30 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/Makefile.in (html): reverted/amended changes of 2005-07-24
+ that broke TkAqua 'make install'; added BUILD_HTML_FLAGS
+ optional var like in tcl/unix/Makefile.in.
+
2005-07-28 Jeff Hobbs <jeffh@ActiveState.com>
* macosx/tkMacOSXDraw.c (XDrawLines, XDrawSegments): correct
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0b0f1a1..afa5437 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.87.2.12 2005/07/25 01:33:51 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.87.2.13 2005/07/30 06:45:40 das Exp $
# Current Tk version; used in various names.
@@ -1463,10 +1463,13 @@ html-tk:
@EXTRA_BUILD_HTML@
BUILD_HTML = \
- @if test -f "$(TCL_EXE)"; then \
- $(TCL_EXE) $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
- --srcdir=$(TOP_DIR)/.. ; \
- fi
+ @if test -f "$(BUILD_TCLSH)"; then \
+ @LD_LIBRARY_PATH_VAR@=$(TCL_BIN_DIR):$${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \
+ TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \
+ TCLSH="$(BUILD_TCLSH)"; else \
+ TCLSH="$(TCL_EXE)"; fi ;\
+ $${TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl --htmldir=$(HTML_INSTALL_DIR) \
+ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS)
#
# Target to create a Macintosh version of the distribution. This will