diff --git a/build-aux/libc-so-name.m4 b/build-aux/libc-so-name.m4
index f830139..7866763 100644
--- a/build-aux/libc-so-name.m4
+++ b/build-aux/libc-so-name.m4
@@ -14,7 +14,7 @@ AC_DEFUN([GST_LIBC_SO_NAME],
 save_LIBS=$LIBS
 CFLAGS="$CFLAGS $INCLTDL"
 LIBS="$CFLAGS $LIBLTDL"
-AC_RUN_IFELSE(AC_LANG_PROGRAM([[
+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 #include <ltdl`test $with_system_libltdl = no && echo _`.h>
 `test $with_system_libltdl = no && echo '#include "ltdl.c"' `
 ]], [[
@@ -22,7 +22,7 @@ lt_dlinit();
 return lt_dlopenext("libc") == NULL ? 1 : 0;
 ]]), [gst_cv_libc_dlopen_works=yes],
      [gst_cv_libc_dlopen_works=no],
-     [gst_cv_libc_dlopen_works=no])
+     [gst_cv_libc_dlopen_works=no]])
 CFLAGS=$save_CFLAGS
 LIBS=$save_LIBS
 ])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a89a38a..341d710 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -89,7 +89,7 @@ install-data-local: install-man
 PUBLISHED_CLASSES = Smalltalk.* SystemExceptions.* NetClients.* VFS.*
 
 $(srcdir)/blox.texi: $(top_srcdir)/packages/blox/tk/stamp-classes
-	files=`$(GST_PACKAGE) $(patsubst %, %/package.xml, $(^D)) \
+	files=`$(GST_PACKAGE) $(top_srcdir)/packages/blox/tk/package.xml \
 	  --load --list-files=BloxTK | \
 	  sed s,^,-f,`; \
 	IFS=`printf '\n\t'`; \
@@ -98,7 +98,7 @@ $(srcdir)/blox.texi: $(top_srcdir)/packages/blox/tk/stamp-classes
 	test -f $(srcdir)/blox.texi && touch $(srcdir)/gst-libs.texi 
 
 $(srcdir)/sockets.texi: $(top_srcdir)/packages/sockets/stamp-classes
-	files=`$(GST_PACKAGE) $(patsubst %, %/package.xml, $(^D)) \
+	files=`$(GST_PACKAGE) $(top_srcdir)/packages/sockets/package.xml \
 	  --load --list-files=Sockets | \
 	  sed s,^,-f,`; \
 	IFS=`printf '\n\t'`; \
@@ -107,7 +107,7 @@ $(srcdir)/sockets.texi: $(top_srcdir)/packages/sockets/stamp-classes
 	test -f $(srcdir)/sockets.texi && touch $(srcdir)/gst-libs.texi 
 
 $(srcdir)/complex.texi: $(top_srcdir)/packages/complex/stamp-classes
-	files=`$(GST_PACKAGE) $(patsubst %, %/package.xml, $(^D)) \
+	files=`$(GST_PACKAGE) $(top_srcdir)/packages/complex/package.xml \
 	  --load --list-files=Complex | \
 	  sed s,^,-f,`; \
 	IFS=`printf '\n\t'`; \
@@ -116,7 +116,7 @@ $(srcdir)/complex.texi: $(top_srcdir)/packages/complex/stamp-classes
 	test -f $(srcdir)/complex.texi && touch $(srcdir)/gst-libs.texi 
 
 $(srcdir)/debug.texi: $(top_srcdir)/packages/debug/stamp-classes
-	files=`$(GST_PACKAGE) $(patsubst %, %/package.xml, $(^D)) \
+	files=`$(GST_PACKAGE) $(top_srcdir)/packages/debug/package.xml \
 	  --load --list-files=DebugTools | \
 	  sed s,^,-f,`; \
 	IFS=`printf '\n\t'`; \
@@ -125,7 +125,7 @@ $(srcdir)/debug.texi: $(top_srcdir)/packages/debug/stamp-classes
 	test -f $(srcdir)/debug.texi && touch $(srcdir)/gst-libs.texi 
 
 $(srcdir)/zlib.texi: $(top_srcdir)/packages/zlib/stamp-classes
-	files=`$(GST_PACKAGE) $(patsubst %, %/package.xml, $(^D)) \
+	files=`$(GST_PACKAGE) $(top_srcdir)/packages/zlib/package.xml \
 	  --load --list-files=ZLib | \
 	  sed s,^,-f,`; \
 	IFS=`printf '\n\t'`; \
@@ -134,7 +134,7 @@ $(srcdir)/zlib.texi: $(top_srcdir)/packages/zlib/stamp-classes
 	test -f $(srcdir)/zlib.texi && touch $(srcdir)/gst-libs.texi 
 
 $(srcdir)/dbi.texi: $(top_srcdir)/packages/dbi/stamp-classes
-	files=`$(GST_PACKAGE) $(patsubst %, %/package.xml, $(^D)) \
+	files=`$(GST_PACKAGE) $(top_srcdir)/packages/dbi/package.xml \
 	  --load --list-files=DBI | \
 	  sed s,^,-f,`; \
 	IFS=`printf '\n\t'`; \
@@ -143,7 +143,7 @@ $(srcdir)/dbi.texi: $(top_srcdir)/packages/dbi/stamp-classes
 	test -f $(srcdir)/dbi.texi && touch $(srcdir)/gst-libs.texi 
 
 $(srcdir)/i18n.texi: $(top_srcdir)/packages/iconv/stamp-classes $(top_srcdir)/packages/i18n/stamp-classes
-	files=`$(GST_PACKAGE) $(patsubst %, %/package.xml, $(^D)) \
+	files=`$(GST_PACKAGE) $(top_srcdir)/packages/iconv/package.xml $(top_srcdir)/packages/i18n/package.xml \
 	  --load --list-files=Iconv --list-files=I18N | \
 	  sed s,^,-f,`; \
 	IFS=`printf '\n\t'`; \