From f726661881c5dc4b31252523739ef481feb43134 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Wed, 10 Dec 2008 23:00:09 +0000 Subject: [PATCH] Use the provided pkgIndex.tcl.in. --- win/makefile.vc | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/win/makefile.vc b/win/makefile.vc index 0975ecd..a3dc5e3 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -341,8 +341,9 @@ TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT) #--------------------------------------------------------------------- all: setup $(PROJECT) -$(PROJECT): setup $(OUT_DIR)\pkgIndex.tcl $(PRJLIB) +$(PROJECT): setup $(PRJLIB) pkgIndex install: install-binaries install-libraries install-docs +pkgIndex: setup $(OUT_DIR)\pkgIndex.tcl test: setup $(PROJECT) @set VFS_LIBRARY=$(LIBDIR:\=/) @@ -464,20 +465,11 @@ install-binaries: @if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)" @$(CPY) $(PRJLIB) "$(SCRIPT_INSTALL_DIR)" >NUL -install-libraries: +install-libraries: pkgIndex @echo Installing libraries to '$(SCRIPT_INSTALL_DIR)' @if exist $(LIBDIR) $(CPY) $(LIBDIR)\*.tcl "$(SCRIPT_INSTALL_DIR)" - @if exist $(LIBDIR) $(CPY) $(LIBDIR)\tclIndex "$(SCRIPT_INSTALL_DIR)" @echo Installing package index in '$(SCRIPT_INSTALL_DIR)' - $(TCLSH) << - set f [open $(ROOT)/pkgIndex.tcl.in r] - set data [read $$f] - close $$f - set data [string map {@PACKAGE_VERSION@ $(DOTVERSION) @PKG_LIB_FILE@ $(PRJLIBNAME)} $$data] - set f [open [file join [file normalize {$(SCRIPT_INSTALL_DIR)}] pkgIndex.tcl] w] - puts $$f $$data - close $$f -<< + @$(CPY) $(OUT_DIR)\pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)" install-docs: @echo Installing documentation files to '$(DOC_INSTALL_DIR)' -- 2.23.0