Move the directory creation process outside the 'installbin.sh' script, and

into its own.  The 'installdirs' makefile entry didn't do anything on my laptop,
so it has been replaced with the section from installbin.sh.

This also fixes the bug that we ignored the setting of $(PRIVATEDIR) when
making the directories.

Finally, link pam_winbind with .po objects only, not a mix of .o and .po
(as per Don Mccall's request).

Andrew Bartlett
(This used to be commit c7a883df28da9dd6fb88198df22c4d78bf8acd8b)

2 files changed, 20 insertions, 11 deletions

diff --git a/source3/script/installbin.sh b/source3/script/installbin.sh
index 77bded6420..c2f34082dd 100755
--- a/source3/script/installbin.sh
+++ b/source3/script/installbin.sh
@@ -11,17 +11,6 @@ shift
 shift
 shift
 
-for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do
-if [ ! -d $d ]; then
-mkdir $d
-if [ ! -d $d ]; then
-  echo Failed to make directory $d
-  exit 1
-fi
-fi
-done
-
-
 for p in $*; do
  p2=`basename $p`
  echo Installing $p as $BINDIR/$p2
diff --git a/source3/script/installdirs.sh b/source3/script/installdirs.sh
new file mode 100755
index 0000000000..dd8f7cd19c
--- /dev/null
+++ b/source3/script/installdirs.sh
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+BASEDIR=$1
+SBINDIR=$2
+BINDIR=$3
+LIBDIR=$4
+VARDIR=$5
+PRIVATEDIR=$6
+
+for d in $BASEDIR $SBINDIR $BINDIR $LIBDIR $VARDIR $PRIVATEDIR; do
+if [ ! -d $d ]; then
+mkdir $d
+if [ ! -d $d ]; then
+  echo Failed to make directory $d
+  exit 1
+fi
+fi
+done
+
+