--- lib/replace/libreplace.m4.~1~	Sun Mar  6 13:48:05 2011
+++ lib/replace/libreplace.m4	Fri Jun  3 18:11:29 2011
@@ -5,9 +5,9 @@
 dnl find the libreplace sources. This is meant to work both for 
 dnl libreplace standalone builds, and builds of packages using libreplace
 libreplacedir=""
-libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
+libreplacepaths=". lib/replace libreplace ../libreplace ../replace ../lib/replace ../../lib/replace ../../../lib/replace"
 for d in $libreplacepaths; do
-	if test -f "$d/replace.c"; then
+	if test -f "$srcdir/$d/replace.c"; then
 		libreplacedir="$d"		
 		AC_SUBST(libreplacedir)
 		break;
@@ -34,9 +34,9 @@
 dnl find the libreplace sources. This is meant to work both for 
 dnl libreplace standalone builds, and builds of packages using libreplace
 libreplacedir=""
-libreplacepaths="$srcdir $srcdir/lib/replace $srcdir/libreplace $srcdir/../libreplace $srcdir/../replace $srcdir/../lib/replace $srcdir/../../../lib/replace"
+libreplacepaths=". lib/replace libreplace ../libreplace ../replace ../lib/replace ../../lib/replace ../../../lib/replace"
 for d in $libreplacepaths; do
-	if test -f "$d/replace.c"; then
+	if test -f "$srcdir/$d/replace.c"; then
 		libreplacedir="$d"		
 		AC_SUBST(libreplacedir)
 		break;