tcl-tclreadline/tcl-tclreadline-2.1.0-libdi...

41 lines
1.5 KiB
Diff

Patch by Robert Scheck <robert@fedoraproject.org> for tclreadline >= 2.1.0 which ensures
that tclreadline-2.1.0.so gets installed into /usr/lib64 on 64 bit architectures rather on
/usr/lib as upstream would do. It also avoids undefined non-weak symbols by linking tcl.
--- tclreadline-2.1.0/Makefile.am 2000-12-08 01:50:51.000000000 +0100
+++ tclreadline-2.1.0/Makefile.am.libdir 2010-04-05 20:34:06.000000000 +0200
@@ -22,7 +22,7 @@
## libtclreadline_la_LIBADD = $(LIBS)
libtclreadline_la_LDFLAGS = -release $(MAJOR).$(MINOR).$(PATCHLEVEL)
-tclrldir = @TCLRL_DIR@
+tclrldir = @libdir@
tclrl_SCRIPTS = pkgIndex.tcl tclreadlineCompleter.tcl tclreadlineInit.tcl tclreadlineSetup.tcl
INSTALL_SCRIPT = ${INSTALL_DATA}
--- tclreadline-2.1.0/configure.in 2000-12-08 01:45:45.000000000 +0100
+++ tclreadline-2.1.0/configure.in.libdir 2010-04-07 00:54:26.000000000 +0200
@@ -89,9 +89,9 @@
if test "${prefix}" = "NONE"; then
prefix=$TCL_PREFIX
fi
-TCLRL_LIBDIR="${prefix}/lib"
+TCLRL_LIBDIR="${libdir}"
AC_SUBST(TCLRL_LIBDIR)
-TCLRL_DIR="${TCLRL_LIBDIR}/tclreadline$VERSION"
+TCLRL_DIR="${libdir}"
AC_SUBST(TCLRL_DIR)
# HEADERS
--- tclreadline-2.1.0/Makefile.am 2011-01-01 02:01:57.987194966 +0100
+++ tclreadline-2.1.0/Makefile.am.libdir 2011-01-01 02:35:14.438178363 +0100
@@ -19,7 +19,7 @@
INCLUDES = -I$(TCL_INCLUDE_DIR) -I$(READLINE_INCLUDE_DIR)
-## libtclreadline_la_LIBADD = $(LIBS)
+libtclreadline_la_LIBADD = $(TCL_LIB_SPEC)
libtclreadline_la_LDFLAGS = -release $(MAJOR).$(MINOR).$(PATCHLEVEL)
tclrldir = @libdir@