---
 autoopts/Makefile.am |    2 +-
 doc/mk-agen-texi.sh  |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: autoopts/Makefile.am
===================================================================
--- autoopts/Makefile.am.orig
+++ autoopts/Makefile.am
@@ -159,7 +159,7 @@ INST_SH                   = autoopts-con
 
 man_MANS                  = $(INST_MANS)
 m4data_DATA               = autoopts.m4
-nobase_data_DATA          = $(INST_PKGCFG)
+pkgconfig_DATA          = $(INST_PKGCFG)
 lib_LTLIBRARIES           = $(INST_LIBS)
 nobase_include_HEADERS    = $(INST_HDRS)
 bin_SCRIPTS               = $(INST_SH)
Index: doc/mk-agen-texi.sh
===================================================================
--- doc/mk-agen-texi.sh.orig
+++ doc/mk-agen-texi.sh
@@ -93,9 +93,9 @@ setup_exports()
 
   PATH=${top_builddir}/columns:${PATH}
   timer=`expr ${AG_TIMEOUT} '*' 5`
-  d=`find ${top_builddir}/autoopts -type f -name libopts.a -print`
-  test -f "$d" || die "Cannot locate libopts.a"
-  LIBS="$d ${LIBS}"
+  d=`find ${top_builddir}/autoopts -type f -name libopts.a -o -name libopts.so | head -n 1`
+  LIBS="-L$(dirname "$d") -lopts ${LIBS}"
+  LD_LIBRARY_PATH="$(dirname "$d"):$LD_LIBRARY_PATH"
 
   eval `${EGREP} '^AG_[A-Z_]*' ${top_srcdir}/VERSION`