101 lines
3.2 KiB
Diff
101 lines
3.2 KiB
Diff
Index: Makefile.in
|
|
================================================================================
|
|
--- Makefile.in
|
|
+++ Makefile.in
|
|
@@ -103,7 +103,7 @@
|
|
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
|
|
|
|
lib_BINARIES = $(PKG_LIB_FILE)
|
|
-bin_BINARIES = expect expectk
|
|
+bin_BINARIES = expect
|
|
BINARIES = $(lib_BINARIES) $(bin_BINARIES)
|
|
|
|
SHELL = @SHELL@
|
|
@@ -175,7 +175,7 @@
|
|
TCLSH = $(TCLSH_ENV) $(TCLSH_PROG)
|
|
SHARED_BUILD = @SHARED_BUILD@
|
|
|
|
-INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@
|
|
+INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
|
|
|
|
PKG_CFLAGS = @PKG_CFLAGS@
|
|
|
|
@@ -331,7 +331,7 @@
|
|
|
|
pkgIndex.tcl-hand:
|
|
(echo 'package ifneeded Expect $(PACKAGE_VERSION) \
|
|
- [list load [file join $$dir $(PKG_LIB_FILE)]]'\
|
|
+ [list load [file join $$dir .. .. $(PKG_LIB_FILE)]]'\
|
|
) > pkgIndex.tcl
|
|
|
|
#========================================================================
|
|
@@ -552,29 +552,30 @@
|
|
#========================================================================
|
|
|
|
install-lib-binaries:
|
|
- @mkdir -p $(DESTDIR)$(pkglibdir)
|
|
+ @mkdir -p $(DESTDIR)$(libdir)
|
|
@list='$(lib_BINARIES)'; for p in $$list; do \
|
|
if test -f $$p; then \
|
|
- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
|
|
+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p"; \
|
|
+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(libdir)/$$p; \
|
|
stub=`echo $$p|sed -e "s/.*\(stub\).*/\1/"`; \
|
|
if test "x$$stub" = "xstub"; then \
|
|
- echo " $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
- $(RANLIB_STUB) $(DESTDIR)$(pkglibdir)/$$p; \
|
|
+ echo " $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p"; \
|
|
+ $(RANLIB_STUB) $(DESTDIR)$(libdir)/$$p; \
|
|
else \
|
|
- echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
|
|
- $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
|
|
+ echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
|
|
+ $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
|
|
fi; \
|
|
ext=`echo $$p|sed -e "s/.*\.//"`; \
|
|
if test "x$$ext" = "xdll"; then \
|
|
lib=`basename $$p|sed -e 's/.[^.]*$$//'`.lib; \
|
|
if test -f $$lib; then \
|
|
- echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib"; \
|
|
- $(INSTALL_DATA) $$lib $(DESTDIR)$(pkglibdir)/$$lib; \
|
|
+ echo " $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib"; \
|
|
+ $(INSTALL_DATA) $$lib $(DESTDIR)$(libdir)/$$lib; \
|
|
fi; \
|
|
fi; \
|
|
fi; \
|
|
done
|
|
+ @mkdir -p $(DESTDIR)$(pkglibdir)
|
|
@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
|
|
if test -f $(srcdir)/$$p; then \
|
|
destp=`basename $$p`; \
|
|
@@ -613,7 +614,7 @@
|
|
|
|
uninstall-binaries:
|
|
list='$(lib_BINARIES)'; for p in $$list; do \
|
|
- rm -f $(DESTDIR)$(pkglibdir)/$$p; \
|
|
+ rm -f $(DESTDIR)$(libdir)/$$p; \
|
|
done
|
|
list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
|
|
p=`basename $$p`; \
|
|
--- configure.in
|
|
+++ configure.in
|
|
@@ -49,9 +49,6 @@
|
|
TEA_PATH_TCLCONFIG
|
|
TEA_LOAD_TCLCONFIG
|
|
|
|
-TEA_PATH_TKCONFIG
|
|
-TEA_LOAD_TKCONFIG
|
|
-
|
|
#-----------------------------------------------------------------------
|
|
# Handle the --prefix=... option by defaulting to what Tcl gave.
|
|
# Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
|
|
@@ -79,7 +76,6 @@
|
|
|
|
#TEA_PUBLIC_TCL_HEADERS
|
|
TEA_PRIVATE_TCL_HEADERS
|
|
-TEA_PUBLIC_TK_HEADERS
|
|
|
|
#--------------------------------------------------------------------
|
|
# A few miscellaneous platform-specific items:
|