diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2007-10-12 18:56:33 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2007-10-12 18:56:33 (GMT) |
| commit | 78359f2778567a288d600b8cd89348c49f7a4729 (patch) | |
| tree | a2da74269a6fa2f19ea569d80076db247f1b21e4 | |
| parent | c2d66a489db4404a14f95e330f3a3cbdd5309053 (diff) | |
| download | tk-78359f2778567a288d600b8cd89348c49f7a4729.zip tk-78359f2778567a288d600b8cd89348c49f7a4729.tar.gz tk-78359f2778567a288d600b8cd89348c49f7a4729.tar.bz2 | |
Fixed install of tk broken with last commit
| -rw-r--r-- | win/makefile.vc | 11 | ||||
| -rw-r--r-- | win/rules.vc | 3 |
2 files changed, 5 insertions, 9 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index adfcc13..d74e005 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -12,7 +12,7 @@ # Copyright (c) 2001-2004 David Gravereaux. # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: makefile.vc,v 1.108 2007/10/12 14:14:54 patthoyts Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.109 2007/10/12 18:56:33 patthoyts Exp $ #------------------------------------------------------------------------------ # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR) @@ -408,11 +408,6 @@ BITMAPDIR = $(ROOT)\bitmaps DOCDIR = $(ROOT)\doc RCDIR = $(WINDIR)\rc -!if $(TCLINSTALL) -TCL_INCLUDES = -I "$(_TCLDIR)\include" -!else -TCL_INCLUDES = -I "$(_TCLDIR)\win" -I "$(_TCLDIR)\generic" -!endif TK_INCLUDES = -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(BITMAPDIR)" -I"$(XLIBDIR)" \ $(TCL_INCLUDES) @@ -951,13 +946,13 @@ package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin $(TK #" install-libraries: - @echo installing Tk headers + @echo installing Tk headers to "$(INCLUDE_INSTALL_DIR)" @$(CPY) "$(GENERICDIR)\tk.h" "$(INCLUDE_INSTALL_DIR)\" @$(CPY) "$(GENERICDIR)\tkDecls.h" "$(INCLUDE_INSTALL_DIR)\" @$(CPY) "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\" @$(CPY) "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)\" @$(CPY) "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11\" - @echo installing script library + @echo installing script library to "$(SCRIPT_INSTALL_DIR)" @$(CPY) "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\" @echo installing theme library @$(CPY) "$(ROOT)\library\ttk\*" "$(SCRIPT_INSTALL_DIR)\ttk\" diff --git a/win/rules.vc b/win/rules.vc index eeb5f9f..f010169 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -11,7 +11,7 @@ # Copyright (c) 2003-2007 Patrick Thoyts # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.17 2007/10/12 14:14:54 patthoyts Exp $ +# RCS: @(#) $Id: rules.vc,v 1.18 2007/10/12 18:56:33 patthoyts Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -581,6 +581,7 @@ TCL_INCLUDES = -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win" !if "$(PROJECT)" == "tk" _TK_H = ..\generic\tk.h +_INSTALLDIR = $(_INSTALLDIR)\.. !endif !ifdef PROJECT_REQUIRES_TK |