summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2008-12-22 14:49:32 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2008-12-22 14:49:32 (GMT)
commita43f218a940239942581439eb0e1e97bd09f66d7 (patch)
tree650cf8f5ff65a10e6bb337c96fef64ce0f49394d
parenta2648a12653304079b214f1136e7626d3f63b4f2 (diff)
downloadtcl-a43f218a940239942581439eb0e1e97bd09f66d7.zip
tcl-a43f218a940239942581439eb0e1e97bd09f66d7.tar.gz
tcl-a43f218a940239942581439eb0e1e97bd09f66d7.tar.bz2
[Bug 2458395] Ensure pkgs directories are suitable and quote the paths.
-rw-r--r--ChangeLog5
-rw-r--r--win/makefile.vc37
2 files changed, 32 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 0d785a1..28ba582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-22 Pat Thoyts <patthoyts@users.sourceforge.net>
+
+ * win/makefile.vc: [Bug 2458395] Ensure pkgs directories are
+ suitable and quote the paths.
+
2008-12-22 Joe Mistachkin <joe@mistachkin.com>
* tools/man2help2.tcl: Added support for "\(mi" nroff macro.
diff --git a/win/makefile.vc b/win/makefile.vc
index 93b7254..4319f8a 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -13,7 +13,7 @@
# Copyright (c) 2003-2008 Pat Thoyts.
#
#------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.194 2008/12/22 01:40:57 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.195 2008/12/22 14:49:32 patthoyts Exp $
#------------------------------------------------------------------------------
# Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -635,18 +635,35 @@ $(TCLREGLIB): $(TMP_DIR)\tclWinReg.obj $(TCLSTUBLIB)
pkgs:
@for /d %d in ($(PKGSDIR)\*) do \
- @pushd %~fd\win & \
- $(MAKE) -nologo -f makefile.vc TCLDIR=$(ROOT)
+ @if exist "%~fd\win\makefile.vc" ( \
+ pushd "%~fd\win" & \
+ $(MAKE) -nologo -f makefile.vc TCLDIR=$(ROOT) &\
+ popd \
+ )
test-pkgs:
@for /d %d in ($(PKGSDIR)\*) do \
- @pushd %~fd\win & \
- $(MAKE) -nologo -f makefile.vc TCLDIR=$(ROOT) test
+ @if exist "%~fd\win\makefile.vc" ( \
+ pushd "%~fd\win" & \
+ $(MAKE) -nologo -f makefile.vc TCLDIR=$(ROOT) test &\
+ popd \
+ )
install-pkgs:
@for /d %d in ($(PKGSDIR)\*) do \
- @pushd %~fd\win & \
- $(MAKE) -nologo -f makefile.vc TCLDIR=$(ROOT) install
+ @if exist "%~fd\win\makefile.vc" ( \
+ pushd "%~fd\win" & \
+ $(MAKE) -nologo -f makefile.vc TCLDIR=$(ROOT) install &\
+ popd \
+ )
+
+clean-pkgs:
+ @for /d %d in ($(PKGSDIR)\*) do \
+ @if exist "%~fd\win\makefile.vc" ( \
+ pushd "%~fd\win" & \
+ $(MAKE) -nologo -f makefile.vc TCLDIR=$(ROOT) clean &\
+ popd \
+ )
$(CAT32): $(WINDIR)\cat.c
$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?
@@ -785,11 +802,11 @@ $(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX) $(DOCDIR)\*
$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(VERSION) $(DOCDIR:\=/)
install-docs:
-!if exist($(CHMFILE))
+!if exist("$(CHMFILE)")
@echo Installing compiled html help
@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
!endif
-!if exist($(HELPFILE))
+!if exist("$(HELPFILE)")
@echo Installing Windows help
@$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
@$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
@@ -1158,7 +1175,7 @@ tidy:
@echo Removing $(TCLREGLIB) ...
@if exist $(TCLREGLIB) del $(TCLREGLIB)
-clean:
+clean: clean-pkgs
@echo Cleaning $(TMP_DIR)\* ...
@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)
@echo Cleaning $(WINDIR)\nmakehlp.obj ...