diff options
| author | andreask <andreask> | 2012-06-14 16:53:03 (GMT) |
|---|---|---|
| committer | andreask <andreask> | 2012-06-14 16:53:03 (GMT) |
| commit | 83e1683f2318836c6aded62dd3eb3986aacce6d1 (patch) | |
| tree | c9584d55ddbb4d385734f23ff69550e18b6651a9 | |
| parent | 314b8aca482e318b8a62ae829671b364631f681e (diff) | |
| download | tk-83e1683f2318836c6aded62dd3eb3986aacce6d1.zip tk-83e1683f2318836c6aded62dd3eb3986aacce6d1.tar.gz tk-83e1683f2318836c6aded62dd3eb3986aacce6d1.tar.bz2 | |
Re-added PATCH_LEVEL to Tk's unix pkgIndex.tcl, lost by [60bd3f4fc5].
| -rw-r--r-- | unix/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 52ad3be..9ae26e1 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -727,13 +727,13 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} return";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \ - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ else \ echo "if {(\$$::tcl_platform(platform) eq \"unix\")";\ echo " && ([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\ - echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\ echo "} else {";\ - echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\ echo "}";\ fi \ ) > "$(PKG_INDEX)"; \ |