diff options
| author | treectrl <treectrl> | 2005-05-30 19:33:59 (GMT) |
|---|---|---|
| committer | treectrl <treectrl> | 2005-05-30 19:33:59 (GMT) |
| commit | 57ee7d0a976f784c4e62137399624cd2ac8b53db (patch) | |
| tree | 0d61867a862a6721a99d784fc076ef8af47a35bb /Makefile.in | |
| parent | 0939e14fd6d8ad161eafa91e6c59f19a4c9c60f1 (diff) | |
| download | tktreectrl-57ee7d0a976f784c4e62137399624cd2ac8b53db.zip tktreectrl-57ee7d0a976f784c4e62137399624cd2ac8b53db.tar.gz tktreectrl-57ee7d0a976f784c4e62137399624cd2ac8b53db.tar.bz2 | |
Don't set env(TREECTRL_LIBRARY) in the pkgIndex.tcl file, leave that for the Makefile during building. Set treectrl_library if env(TREECTRL_LIBRARY) is undefined. This fixes a problem with multiple versions of treectrl being installed. Still a conflict with previous 1.1 pkgIndex.tcl file however, which sets env(TREECTRL_LIBRARY).
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 7c95325..187368f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -12,7 +12,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: Makefile.in,v 1.5 2005/05/28 21:50:30 treectrl Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.6 2005/05/30 19:33:59 treectrl Exp $ #======================================================================== # Edit the following few lines when writing a new extension @@ -283,12 +283,13 @@ VPATH = $(srcdir):$(srcdir)/generic:$(srcdir)/unix:$(srcdir)/win pkgIndex.tcl: (\ echo 'if {[catch {package require Tcl 8.4}]} return';\ + echo 'set script ""';\ echo 'if {![info exists ::env(TREECTRL_LIBRARY)]';\ echo ' && [file exists [file join $$dir treectrl.tcl]]} {';\ - echo ' set ::env(TREECTRL_LIBRARY) $$dir';\ + echo ' append script "set ::treectrl_library \"$$dir\"\n"';\ echo '}';\ - echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_PATCHLEVEL) \ - [list load [file join $$dir $(PKG_LIB_FILE)] $(PACKAGE_NAME)]'\ + echo 'append script "load \"[file join $$dir $(PKG_LIB_FILE)]\" $(PACKAGE_NAME)"';\ + echo 'package ifneeded $(PACKAGE_NAME) $(PACKAGE_PATCHLEVEL) $$script'\ ) > pkgIndex.tcl #======================================================================== |