[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit b39a1fa77a9f16b5ccd08194d1ec9835d89a40f2
Author: Clint Adams <schizo at debian.org>
Date:   Fri Aug 6 19:44:26 2004 +0000

    use --libdir instead of hardcoding ${PREFIX]/lib/libfakeroot.  closes: #260073.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-21

diff --git a/debian/changelog b/debian/changelog
index 241030d..b0cbf91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ fakeroot (1.0.6) unstable; urgency=low
   * doc/fakeroot.1: remove reference to potato.  closes: #263938.
   * doc/fr/fakeroot.1: updated French manpage translation from Sylvain
     Cherrier.  closes: #263947.
+  * scripts/Makefile.am, scripts/fakeroot.in: use --libdir instead of
+    hardcoding ${PREFIX]/lib/libfakeroot.  closes: #260073.
 
  -- Clint Adams <schizo at debian.org>  Thu, 15 Jul 2004 09:34:31 -0400
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index ea8721f..cfdbed0 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -5,6 +5,7 @@ CLEANFILES=fakeroot
 
 do_subst = sed -e 's,[@]prefix[@],$(prefix),g' \
 	   -e 's,[@]bindir[@],$(bindir),g' \
+	   -e 's,[@]libdir[@],$(libdir),g' \
 	   -e 's,[@]fakeroot_transformed[@],'`echo fakeroot | sed -e '$(transform)'`',g' \
 	   -e 's,[@]faked_transformed[@],'`echo faked | sed -e '$(transform)'`',g' \
 	   -e 's,[@]VERSION[@],$(VERSION),g' 
diff --git a/scripts/fakeroot.in b/scripts/fakeroot.in
index 9be13c9..eedc22e 100755
--- a/scripts/fakeroot.in
+++ b/scripts/fakeroot.in
@@ -19,7 +19,7 @@ PREFIX=@prefix@
 BINDIR=@bindir@
     
 LIB=lib at fakeroot_transformed@.so.0
-PATHS=${PREFIX}/lib/libfakeroot:${PREFIX}/lib64/libfakeroot
+PATHS=@libdir@:${PREFIX}/lib64/libfakeroot
 FAKED=${BINDIR}/@faked_transformed@
 
 FAKED_MODE="unknown-is-root"

-- 
fakeroot