From 28cc067ae10647bdc4b76d43be30a1c460ae828b Mon Sep 17 00:00:00 2001 From: hobbs Date: Fri, 16 Aug 2002 07:52:23 +0000 Subject: * 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. --- ChangeLog | 7 +++++++ unix/Makefile.in | 16 ++++++++-------- win/Makefile.in | 18 +++++++++--------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 301ffb2..e8c9aa2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2002-08-16 Jeff Hobbs + + * 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. + 2002-08-14 Vince Darley * win/tkWinDialog.c: diff --git a/unix/Makefile.in b/unix/Makefile.in index b12c91f..755ae67 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.79 2002/08/08 11:43:08 rmax Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.80 2002/08/16 07:52:23 hobbs Exp $ # Current Tk version; used in various names. @@ -511,15 +511,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(TK_BUILD_EXP_FILE) wish @if test ! -x $(UNIX_DIR)/install-sh; then \ chmod +x $(UNIX_DIR)/install-sh; \ fi - @if test "$(TK_SHARED_BUILD)"; then \ + @if test "x$(TK_SHARED_BUILD)" = "x1"; then \ echo "Creating package index $(PKG_INDEX)"; \ rm -f $(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_LIB_FILE)] Tk]" >> $(PKG_INDEX); \ + (\ + echo "if {[package vcompare [package provide Tcl]\ + $(TCLVERSION)] != 0} { return }";\ + echo "package ifneeded Tk $(VERSION)\ + [list load [file join \$$dir .. $(TK_LIB_FILE)] Tk]";\ + ) > $(PKG_INDEX); \ fi @echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/" @@INSTALL_LIB@ 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 \ -- cgit v0.12