summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordas <das>2005-08-25 04:13:42 (GMT)
committerdas <das>2005-08-25 04:13:42 (GMT)
commit43af189a4068fc022433746106669e2ac014414c (patch)
treeb15b8fd44ba6f3444c40ab5c8516d7695cedc59c
parent188e67ee2b08d7869fe3e6c48532f8d7f5578c57 (diff)
downloadtk-43af189a4068fc022433746106669e2ac014414c.zip
tk-43af189a4068fc022433746106669e2ac014414c.tar.gz
tk-43af189a4068fc022433746106669e2ac014414c.tar.bz2
* unix/Makefile.in (html): reverted/amended changes of 2005-08-23
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 4c6ae7c..c7ed199 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-25 Daniel Steffen <das@users.sourceforge.net>
+
+ * unix/Makefile.in (html): reverted/amended changes of 2005-08-23
+ that broke TkAqua 'make install'; added BUILD_HTML_FLAGS
+ optional var like in tcl/unix/Makefile.in.
+
2005-08-24 Donal K. Fellows <dkf@users.sf.net>
* tests/text.test (text-8.18): Fix punctuation of error message to
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 1348949..f5af0cb 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.107 2005/08/23 18:25:34 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.108 2005/08/25 04:13:42 das Exp $
# Current Tk version; used in various names.
@@ -1481,10 +1481,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)
#
# Targets to build Solaris package of the distribution for the current