[Fakeroot-commits] [SCM] fakeroot branch, master, updated. debian/1.11.4

[Clint Adams]

The following commit has been merged in the master branch:
commit 2e3c073b8155d73ffaa9b88fa7c9d97546e35e0e
Author: Akim Demaille <demaille at gostai.com>
Date:   Mon Dec 15 16:32:38 2008 +0100

    Use DLSUFFIX in the tests.
    
    	* script/fakeroot.in: Improve error messages.
    	* test/Makefile.am (TESTS_ENVIRONMENT): Use $(DLSUFFIX).

diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
index dba738b..d66c54a 100755
--- a/scripts/fakeroot.in
+++ b/scripts/fakeroot.in
@@ -14,10 +14,11 @@ EOF
   exit 1
 }
 
+
 # strip /bin/fakeroot to find install prefix
 PREFIX=@prefix@
 BINDIR=@bindir@
-    
+
 USEABSLIBPATH=@LDPRELOADABS@
 LIB=lib at fakeroot_transformed@@DLSUFFIX@
 PATHS=@libdir@:${PREFIX}/lib64/libfakeroot:${PREFIX}/lib32/libfakeroot
@@ -116,7 +117,7 @@ fi
 
 if test $libfound = no
 then
-    echo >&2 "fakeroot: preload library not found, aborting."
+    echo >&2 "fakeroot: preload library \`$LIB' not found, aborting."
     exit 1
 fi
 
@@ -166,3 +167,7 @@ else
 fi
 
 exit $RESULT
+
+# Local Variables:
+# mode: shell-script
+# End:
diff --git a/test/Makefile.am b/test/Makefile.am
index 0d99c67..8eacab1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,10 +4,10 @@ TESTS = t.echoarg t.mknod t.tar t.truereturn t.falsereturn t.option \
 	t.touchinstall t.no_ld_preload t.no_ld_preload_link t.chmod_dev
 
 suffix =
-TESTS_ENVIRONMENT =							\
-  libfakeroot=libfakeroot-0.so						\
-  srcdir=$(srcdir)							\
-  suffix=$(suffix)							\
+TESTS_ENVIRONMENT =				\
+  libfakeroot=libfakeroot-0$(DLSUFFIX)		\
+  srcdir=$(srcdir)				\
+  suffix=$(suffix)				\
   posixshell=$(SHELL)
 
 CLEANFILES = tmp* tartest.tar.gz hda3

-- 
fakeroot