diff options
| author | hobbs <hobbs> | 2002-08-16 07:52:23 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2002-08-16 07:52:23 (GMT) |
| commit | 28cc067ae10647bdc4b76d43be30a1c460ae828b (patch) | |
| tree | a6c071fae92c36cd6e4a03cd655f65d5b0f7e2df /win/Makefile.in | |
| parent | 2ef516f29db94e05730be54dcbb6ce0346e9b08d (diff) | |
| download | tk-28cc067ae10647bdc4b76d43be30a1c460ae828b.zip tk-28cc067ae10647bdc4b76d43be30a1c460ae828b.tar.gz tk-28cc067ae10647bdc4b76d43be30a1c460ae828b.tar.bz2 | |
* unix/Makefile.in (install-binaries): simplified pkgIndex.tcl
file created on installation.
* win/Makefile.in (install-binaries): corrected and simplified
creation of pkgIndex.tcl file on installation.
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index bc69975..7b1f490 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.55 2002/07/16 23:17:09 mdejong Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.56 2002/08/16 07:52:24 hobbs Exp $ TCLVERSION = @TCL_VERSION@ VERSION = @TK_VERSION@ @@ -74,10 +74,10 @@ MANN_INSTALL_DIR = $(MAN_INSTALL_DIR)/mann TK_DBGX = @TK_DBGX@ # Directory in which to install the pkgIndex.tcl file for loadable Tk -PKG_INSTALL_DIR = $(LIB_INSTALL_DIR)/tk$(VERSION)$(TK_DBGX) +PKG_INSTALL_DIR = $(LIB_INSTALL_DIR)/tk$(VERSION)$(TK_DBGX) # Package index file for loadable Tk -PKG_INDEX = $(PKG_INSTALL_DIR)/pkgIndex.tcl +PKG_INDEX = $(PKG_INSTALL_DIR)/pkgIndex.tcl # The directory containing the Tcl source and header files. TCL_SRC_DIR = @TCL_SRC_DIR@ @@ -443,12 +443,12 @@ install-binaries: binaries done @echo "Creating package index $(PKG_INDEX)"; @$(RM) $(PKG_INDEX); - @echo "if {[package vcompare \\" > $(PKG_INDEX); - @echo " [package provide Tcl] \\" >> $(PKG_INDEX); - @echo " $(TCLVERSION)] != 0} {return}" >> $(PKG_INDEX); - @echo "package ifneeded Tk $(VERSION) \\" >> $(PKG_INDEX); - @echo " [list load [file join \$$dir .. \\" >> $(PKG_INDEX); - @echo " $(TK_DLL_FILE)] Tk]" >> $(PKG_INDEX); + @(\ + echo "if {[package vcompare [package provide Tcl]\ + $(TCLVERSION)] != 0} { return }";\ + echo "package ifneeded Tk $(VERSION)\ + [list load [file join \$$dir .. .. bin $(TK_DLL_FILE)] Tk]";\ + ) > $(PKG_INDEX); @for i in tkConfig.sh $(TK_LIB_FILE) $(TK_STUB_LIB_FILE); \ do \ if [ -f $$i ]; then \ |