Magellan Linux

Contents of /trunk/expect/patches/expect-5.43.0-pkgpath.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 792 - (show annotations) (download)
Sun May 10 08:02:28 2009 UTC (15 years ago) by niro
File size: 1708 byte(s)
tcl85 fixes

1 diff -up expect-5.43/configure.in.pkgpath expect-5.43/configure.in
2 --- expect-5.43/configure.in.pkgpath 2008-09-25 12:28:28.000000000 +0200
3 +++ expect-5.43/configure.in 2008-09-25 12:28:28.000000000 +0200
4 @@ -1260,6 +1260,7 @@ AC_SUBST(SETUID)
5 AC_SUBST(UNSHARED_RANLIB)
6 AC_SUBST(DEFAULT_STTY_ARGS)
7 AC_SUBST(STTY_BIN)
8 +AC_SUBST(TCL_VERSION)
9 AC_OUTPUT([Makefile \
10 pkgIndex],
11 chmod +x ${srcdir}/install-sh ${srcdir}/mkinstalldirs)
12 diff -up expect-5.43/Makefile.in.pkgpath expect-5.43/Makefile.in
13 --- expect-5.43/Makefile.in.pkgpath 2008-09-25 12:28:28.000000000 +0200
14 +++ expect-5.43/Makefile.in 2008-09-25 12:28:28.000000000 +0200
15 @@ -173,8 +173,8 @@ STTY = -DDFLT_STTY="\"@DEFAULT_STTY_ARGS
16 bindir = $(INSTALL_ROOT)@bindir@
17 bindir_arch_indep = $(INSTALL_ROOT)$(prefix)/bin
18 tcl_libdir = $(INSTALL_ROOT)@libdir@
19 -libdir = $(INSTALL_ROOT)@libdir@/expect$(VERSION)
20 -libdir_arch_indep = $(INSTALL_ROOT)$(prefix)/lib/expect$(VERSION)
21 +libdir = $(INSTALL_ROOT)@libdir@/tcl@TCL_VERSION@/expect$(VERSION)
22 +libdir_arch_indep = $(INSTALL_ROOT)@datadir@/tcl@TCL_VERSION@/expect$(VERSION)
23
24 mandir = $(INSTALL_ROOT)@mandir@
25 man1dir = $(mandir)/man1
26 diff -up expect-5.43/pkgIndex.in.pkgpath expect-5.43/pkgIndex.in
27 --- expect-5.43/pkgIndex.in.pkgpath 2002-02-12 03:00:56.000000000 +0100
28 +++ expect-5.43/pkgIndex.in 2008-09-25 12:28:28.000000000 +0200
29 @@ -7,4 +7,4 @@
30 # script is sourced, the variable $dir must contain the
31 # full path name of this file's directory.
32
33 -package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
34 +package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. .. @EXP_SHARED_LIB_FILE@]]