diff options
author | William Joye <wjoye@cfa.harvard.edu> | 2017-01-27 17:29:39 (GMT) |
---|---|---|
committer | William Joye <wjoye@cfa.harvard.edu> | 2017-01-27 17:29:39 (GMT) |
commit | 0bcf3488c882728655709331fb2d40771157b207 (patch) | |
tree | 10ba54d5e048f7bbfecb7572d9c70b1e660b5beb | |
parent | 7bb51ebbe6dbcb3e2fc6a34014fc936de6363cbd (diff) | |
download | blt-0bcf3488c882728655709331fb2d40771157b207.zip blt-0bcf3488c882728655709331fb2d40771157b207.tar.gz blt-0bcf3488c882728655709331fb2d40771157b207.tar.bz2 |
fix pkgIndex
-rwxr-xr-x | tkcon/configure | 3 | ||||
-rw-r--r-- | tkcon/configure.ac | 2 | ||||
-rw-r--r-- | tkcon/pkgIndex.tcl | 11 | ||||
-rw-r--r-- | tkcon/pkgIndex.tcl.in | 5 |
4 files changed, 13 insertions, 8 deletions
diff --git a/tkcon/configure b/tkcon/configure index 76d042b..3e2fa0b 100755 --- a/tkcon/configure +++ b/tkcon/configure @@ -5756,7 +5756,7 @@ fi # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -ac_config_files="$ac_config_files Makefile pkgIndex.tcl" +ac_config_files="$ac_config_files Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -6465,7 +6465,6 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "pkgIndex.tcl") CONFIG_FILES="$CONFIG_FILES pkgIndex.tcl" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/tkcon/configure.ac b/tkcon/configure.ac index 29eef9e..e597286 100644 --- a/tkcon/configure.ac +++ b/tkcon/configure.ac @@ -173,4 +173,4 @@ fi # which require substituting th AC variables in. Include these here. #-------------------------------------------------------------------- -AC_OUTPUT([Makefile pkgIndex.tcl]) +AC_OUTPUT([Makefile]) diff --git a/tkcon/pkgIndex.tcl b/tkcon/pkgIndex.tcl new file mode 100644 index 0000000..431442a --- /dev/null +++ b/tkcon/pkgIndex.tcl @@ -0,0 +1,11 @@ +# pkgIndex.tcl to use tkcon as a package via 'package require tkcon' +# +# 'tkcon show' will do all that is necessary to display tkcon +# +# Defaults to: +# * the main interp as the "slave" +# * hiding tkcon when you click in the titlebar [X] +# * using '.tkcon' as the root toplevel +# * not displaying itself at 'package require' time +# +package ifneeded tkcon 2.7 [list source [file join $dir tkcon.tcl]] diff --git a/tkcon/pkgIndex.tcl.in b/tkcon/pkgIndex.tcl.in deleted file mode 100644 index d7566b4..0000000 --- a/tkcon/pkgIndex.tcl.in +++ /dev/null @@ -1,5 +0,0 @@ -# -# Tcl package index file -# -package ifneeded @PACKAGE_NAME@ @PACKAGE_VERSION@ \ - [list load [file join $dir @PKG_LIB_FILE@] @PACKAGE_NAME@] |