-somewhat more elegant method, supporting the src subdir (-Markus)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/install/unix/setup/general/createall b/install/unix/setup/general/createall
index 8dbb300f70ab233059513c2b218c7a17c3abb52b..6e4446da1d1693a69206d46953fb1f6ae1faa8d7 100755 (executable)
--- a/install/unix/setup/general/createall
+++ b/install/unix/setup/general/createall
@@ -1,5 +1,40 @@
 #! /bin/sh
 
 #! /bin/sh
 

+# Just grab dirbase/dir(s)
+readbase ()
+{
+    DIRBASE=$1
+    DIRCONTENTS=$2
+    for each in $DIRBASE/*
+    do
+       if test -d $each
+       then
+           DIRCONTENTS="$DIRCONTENTS $each"
+       fi
+    done
+    echo $DIRCONTENTS
+}
+
+# Prefer subdir/src over subdir, use whichever available
+readbase2 ()
+{
+    DIRBASE=$1
+    DIRCONTENTS=$2
+    for each in $DIRBASE/*
+    do
+       if test -d $each
+       then
+           if test -d $each/src
+           then
+               DIRCONTENTS="$DIRCONTENTS $each/src"
+           else
+               DIRCONTENTS="$DIRCONTENTS $each"
+           fi
+       fi
+    done
+    echo $DIRCONTENTS
+}
+

 OS=$OSTYPE
 
 if test "x$OS" = x; then 
 OS=$OSTYPE
 
 if test "x$OS" = x; then 


@@ -10,37 +45,10 @@ if test "x$OS" = x; then
   exit 1
 fi
 
   exit 1
 fi
 

-TMP_CONT=`ls src`
-SRC_DIR=src
-for each in $TMP_CONT; do
-  if test -d src/$each ; then 
-    SRC_DIR="$SRC_DIR src/$each"
-  fi
-done
-
-TMP_CONT=`ls samples`
-SAMPLES_DIR=
-for each in $TMP_CONT; do
-  if test -d samples/$each ; then 
-    SAMPLES_DIR="$SAMPLES_DIR samples/$each"
-  fi
-done
-
-TMP_CONT=`ls utils`
-UTILS_DIR=
-for each in $TMP_CONT; do
-  if test -d utils/$each ; then 
-    UTILS_DIR="$UTILS_DIR utils/$each"
-  fi
-done
-
-TMP_CONT=`ls user`
-USER_DIR=
-for each in $TMP_CONT; do
-  if test -d user/$each ; then 
-    USER_DIR="$USER_DIR user/$each"
-  fi
-done
+SRC_DIR=`readbase src src`
+SAMPLES_DIR=`readbase2 samples`
+UTILS_DIR=`readbase2 utils`
+USER_DIR=`readbase2 user`

 
 ALL_DIR="$SRC_DIR $SAMPLES_DIR $UTILS_DIR $USER_DIR"
 
 
 ALL_DIR="$SRC_DIR $SAMPLES_DIR $UTILS_DIR $USER_DIR"