summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-05-23 19:10:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:22:44 -0500
commitaf720295fdf7576e19d0def6f352aedd184a3744 (patch)
treeeef7b6031228c50a48dfd6e8129e5e003c7da46d
parent2945490a0fb3dbcd6088a8825a3cd46d9f91ebf7 (diff)
downloadsamba-af720295fdf7576e19d0def6f352aedd184a3744.tar.gz
samba-af720295fdf7576e19d0def6f352aedd184a3744.tar.bz2
samba-af720295fdf7576e19d0def6f352aedd184a3744.zip
r23093: Allow modules with the same name but different types.
(This used to be commit 190a69b1f9d7a0f858ed56c505c2d3c473273463)
-rwxr-xr-xsource3/script/installmodules.sh14
1 files changed, 11 insertions, 3 deletions
diff --git a/source3/script/installmodules.sh b/source3/script/installmodules.sh
index f6e52880fe..f70db003ed 100755
--- a/source3/script/installmodules.sh
+++ b/source3/script/installmodules.sh
@@ -19,11 +19,19 @@ fi
fi
done
+# We expect the last component of LIBDIR to be the module type, eg. idmap,
+# pdb. By stripping this from the installation name, you can have multiple
+# modules of the same name but different types by creating eg. idmap_foo
+# and pdb_foo. This makes the most sense for idmap and pdb module, where
+# they need to be consistent.
+mtype=`basename $LIBDIR`
+
for p in $*; do
p2=`basename $p`
- echo Installing $p as $DESTDIR/$LIBDIR/$p2
- cp -f $p $DESTDIR/$LIBDIR/
- chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$p2
+ name=`echo $p2 | sed -es/${mtype}_//`
+ echo Installing $p as $DESTDIR/$LIBDIR/$name
+ cp -f $p $DESTDIR/$LIBDIR/$name
+ chmod $INSTALLPERMS $DESTDIR/$LIBDIR/$name
done
exit 0