summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorwart <wart>1999-09-10 00:23:12 (GMT)
committerwart <wart>1999-09-10 00:23:12 (GMT)
commit41c436747407d9a427a6dfed85259c399b8d53e0 (patch)
tree462170c4f878664774d6fa20ab2a0543883d6c0c /win
parent73996d52f3222139f2789a89017704459534e839 (diff)
downloadtk-41c436747407d9a427a6dfed85259c399b8d53e0.zip
tk-41c436747407d9a427a6dfed85259c399b8d53e0.tar.gz
tk-41c436747407d9a427a6dfed85259c399b8d53e0.tar.bz2
Made sure that the tkConfig.sh file is always installed.
configure now substitutes XINCLUDES in tkConfig.sh. Needed for Tk extensions like Itk.
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in6
-rw-r--r--win/configure.in4
2 files changed, 6 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index ee28707..ca66aa1 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.9 1999/08/26 18:24:18 wart Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.10 1999/09/10 00:23:12 wart Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -378,13 +378,13 @@ install-binaries:
fi
@if test "$(TK_STUB_LIB_FILE)" != "" ; then \
if [ -f $(TK_STUB_LIB_FILE) ]; then \
- echo "Installing tkConfig.sh" ; \
- $(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh; \
echo "Installing $(TK_STUB_LIB_FILE)"; \
$(INSTALL_DATA) $(TK_STUB_LIB_FILE) \
$(LIB_INSTALL_DIR)/$(TK_STUB_LIB_FILE); \
fi; \
fi
+ echo "Installing tkConfig.sh"
+ $(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkConfig.sh
install-libraries:
@echo "Install Directories:"
diff --git a/win/configure.in b/win/configure.in
index fe69ed2..21dcdd1 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -2,7 +2,7 @@
# generate the file "configure", which is run during Tk installation
# to configure the system for the local environment.
#
-# RCS: @(#) $Id: configure.in,v 1.8 1999/08/10 23:16:42 redman Exp $
+# RCS: @(#) $Id: configure.in,v 1.9 1999/09/10 00:23:12 wart Exp $
AC_INIT(../generic/tk.h)
@@ -139,5 +139,7 @@ AC_SUBST(EXESUFFIX)
AC_SUBST(LIBRARIES)
AC_SUBST(MAKE_LIB)
AC_SUBST(MAKE_DLL)
+AC_SUBST(TK_XINCLUDES)
+AC_SUBST(XINCLUDES)
AC_OUTPUT(Makefile tkConfig.sh)