summaryrefslogtreecommitdiffstats
path: root/win/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-10 11:31:02 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-10 11:31:02 (GMT)
commit424ff3b68c8ecc22d0f8de08c13bbea69036e334 (patch)
treedb2cf9676505d741b2180ad7b931c8b00dbd82b4 /win/Makefile.in
parentae15ddb2ebc7381aa51cd18473d4d5408e05e012 (diff)
parent4cc39eb0353b0c510d6e501b0ea911b913e31e29 (diff)
downloadtcl-424ff3b68c8ecc22d0f8de08c13bbea69036e334.zip
tcl-424ff3b68c8ecc22d0f8de08c13bbea69036e334.tar.gz
tcl-424ff3b68c8ecc22d0f8de08c13bbea69036e334.tar.bz2
merge novem
Diffstat (limited to 'win/Makefile.in')
-rw-r--r--win/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index f56c32d..3cda882 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -638,8 +638,8 @@ install-libraries: libraries install-tzdata install-msgs
do \
$(COPY) "$$j" "$(SCRIPT_INSTALL_DIR)/http1.0"; \
done;
- @echo "Installing package http 2.8.5 as a Tcl Module";
- @$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.5.tm;
+ @echo "Installing package http 2.8.6 as a Tcl Module";
+ @$(COPY) $(ROOT_DIR)/library/http/http.tcl $(SCRIPT_INSTALL_DIR)/../tcl8/8.6/http-2.8.6.tm;
@echo "Installing library opt0.4 directory";
@for j in $(ROOT_DIR)/library/opt/*.tcl; \
do \
@@ -755,7 +755,7 @@ packages:
if [ ! -f $(PKG_DIR)/$$pkg/Makefile ]; then \
( cd $(PKG_DIR)/$$pkg; \
echo "Configuring package '$$i' wd = `pwd -P`"; \
- $$i/configure --with-tcl=$(PWD) --with-tclinclude=$(GENERIC_DIR) $(PKG_CFG_ARGS) --enable-shared --enable-threads; ) \
+ $$i/configure --with-tcl=$$builddir --with-tclinclude=$(GENERIC_DIR) $(PKG_CFG_ARGS) --enable-shared --enable-threads; ) \
fi ; \
echo "Building package '$$pkg'"; \
( cd $(PKG_DIR)/$$pkg; $(MAKE); ) \