|
 |
6b7353 |
diff -up expect5.45/configure.in.orig expect5.45/configure.in
|
|
|
6b7353 |
--- expect5.45/configure.in.orig 2011-01-18 16:58:14.860806442 +0100
|
|
|
6b7353 |
+++ expect5.45/configure.in 2011-01-18 16:58:30.378753210 +0100
|
|
|
6b7353 |
@@ -977,6 +977,7 @@ AC_SUBST(EXP_CC_SEARCH_FLAGS)
|
|
|
6b7353 |
AC_SUBST(SETUID)
|
|
|
6b7353 |
AC_SUBST(SETPGRP_VOID)
|
|
|
6b7353 |
AC_SUBST(DEFAULT_STTY_ARGS)
|
|
|
6b7353 |
+AC_SUBST(TCL_VERSION)
|
|
|
6b7353 |
# Expect uses these from tclConfig.sh to make the main executable
|
|
|
6b7353 |
AC_SUBST(TCL_DL_LIBS)
|
|
|
6b7353 |
AC_SUBST(TCL_CC_SEARCH_FLAGS)
|
|
|
6b7353 |
diff -up expect5.45/Makefile.in.orig expect5.45/Makefile.in
|
|
|
6b7353 |
--- expect5.45/Makefile.in.orig 2011-01-18 16:58:37.787723824 +0100
|
|
|
6b7353 |
+++ expect5.45/Makefile.in 2011-01-18 17:05:10.697636907 +0100
|
|
|
6b7353 |
@@ -121,8 +121,8 @@ includedir = @includedir@
|
|
|
6b7353 |
DESTDIR =
|
|
|
6b7353 |
|
|
|
6b7353 |
PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
|
|
|
6b7353 |
-pkgdatadir = $(datadir)/$(PKG_DIR)
|
|
|
6b7353 |
-pkglibdir = $(libdir)/$(PKG_DIR)
|
|
|
6b7353 |
+pkgdatadir = $(datadir)/tcl@TCL_VERSION@/$(PKG_DIR)
|
|
|
6b7353 |
+pkglibdir = $(libdir)/tcl@TCL_VERSION@/$(PKG_DIR)
|
|
|
6b7353 |
pkgincludedir = $(includedir)/$(PKG_DIR)
|
|
|
6b7353 |
|
|
|
6b7353 |
top_builddir = .
|
|
|
6b7353 |
@@ -263,7 +263,7 @@ install-doc: doc
|
|
|
6b7353 |
else true; fi ; \
|
|
|
6b7353 |
done
|
|
|
6b7353 |
|
|
|
6b7353 |
-test: binaries libraries
|
|
|
6b7353 |
+test: binaries libraries pkgIndex.tcl-test
|
|
|
6b7353 |
$(TCLSH) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
|
|
|
6b7353 |
|
|
|
6b7353 |
shell: binaries libraries
|
|
|
6b7353 |
@@ -331,6 +331,11 @@ pkgIndex.tcl:
|
|
|
6b7353 |
pkgIndex.tcl-hand:
|
|
|
6b7353 |
(echo 'if {![package vsatisfies [package provide Tcl] @TCL_VERSION@]} {return}' ; \
|
|
|
6b7353 |
echo 'package ifneeded Expect $(PACKAGE_VERSION) \
|
|
|
6b7353 |
+ [list load [file join $$dir .. .. $(PKG_LIB_FILE)]]'\
|
|
|
6b7353 |
+ ) > pkgIndex.tcl
|
|
|
6b7353 |
+
|
|
|
6b7353 |
+pkgIndex.tcl-test:
|
|
|
6b7353 |
+ (echo 'package ifneeded Expect $(PACKAGE_VERSION) \
|
|
|
6b7353 |
[list load [file join $$dir $(PKG_LIB_FILE)]]'\
|
|
|
6b7353 |
) > pkgIndex.tcl
|
|
|
6b7353 |
|