74835aa
diff --git a/shlib/Makefile.in b/shlib/Makefile.in
74835aa
--- a/shlib/Makefile.in
74835aa
+++ b/shlib/Makefile.in
74835aa
@@ -178,7 +178,7 @@ $(SHARED_READLINE):	$(SHARED_OBJ)
a08828a
 
4ef4892
 $(SHARED_HISTORY):	$(SHARED_HISTOBJ) xmalloc.so xfree.so
a08828a
 	$(RM) $@
4ef4892
-	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so $(SHLIB_LIBS)
4ef4892
+	$(SHOBJ_LD) ${SHOBJ_LDFLAGS} ${SHLIB_XLDFLAGS} -o $@ $(SHARED_HISTOBJ) xmalloc.so xfree.so
a08828a
 
a08828a
 # Since tilde.c is shared between readline and bash, make sure we compile 
a08828a
 # it with the right flags when it's built as part of readline
74835aa
diff --git a/support/shobj-conf b/support/shobj-conf
74835aa
--- a/support/shobj-conf
74835aa
+++ b/support/shobj-conf
74835aa
@@ -126,10 +126,11 @@ sunos5*|solaris2*)
e4db95e
 linux*-*|gnu*-*|k*bsd*-gnu-*|midnightbsd*|freebsd*|dragonfly*)
6316085
 	SHOBJ_CFLAGS=-fPIC
6316085
 	SHOBJ_LD='${CC}'
6316085
-	SHOBJ_LDFLAGS='-shared -Wl,-soname,$@'
74835aa
+	SHOBJ_LDFLAGS='$(CFLAGS) -shared -Wl,-soname,$@'
6316085
 
6316085
-	SHLIB_XLDFLAGS='-Wl,-rpath,$(libdir) -Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
6316085
+	SHLIB_XLDFLAGS='-Wl,-soname,`basename $@ $(SHLIB_MINOR)`'
6316085
 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
74835aa
+	SHLIB_LIBS='-ltinfo'
6316085
 	;;
6316085
 
b1197d3
 # Darwin/MacOS X