.in with source files expect source code format for distdefs.

[autodist.git] / apps / autodist / autodist.in

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index fd5b1b1d06086942b955dc89e5b2a36d1178e5fe..9740828591bfd6c3eaf25c156dc8695227db0c9a 100755 (executable)
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -697,7 +697,15 @@ ad_process_tree()
        \! -name \*\.[cC]++ -a \
        \! -name \*\.m -a \
        \! -name \*\.[hH] -a \
-       \! -name \*\.hh \)`
+       \! -name \*\.hh -a \
+       \! -name \*\.[cC]\.in -a \
+       \! -name \*\.[cC][cCpP]\.in -a \
+       \! -name \*\.[cC][xX][xX]\.in -a \
+       \! -name \*\.[cC][pP][pP]\.in -a \
+       \! -name \*\.[cC]++\.in -a \
+       \! -name \*\.m\.in -a \
+       \! -name \*\.[hH]\.in -a \
+       \! -name \*\.hh\.in \)`
   files=`echo $files | sed 's/$am_distdir//'`
 
   # Take away noprocess list
@@ -742,7 +750,15 @@ ad_process_source_tree()
        -name \*\.[cC]++ -o \
        -name \*\.m -o \
        -name \*\.[hH] -o \
-       -name \*\.hh \)`
+       -name \*\.hh -o \
+       -name \*\.[cC]\.in -o \
+       -name \*\.[cC][cCpP]\.in -o \
+       -name \*\.[cC][xX][xX]\.in -o \
+       -name \*\.[cC][pP][pP]\.in -o \
+       -name \*\.[cC]++\.in -o \
+       -name \*\.m\.in -o \
+       -name \*\.[hH]\.in -o \
+       -name \*\.hh\.in \)`
 
   # Take away noprocess list
   if test -f autodist.noprocess; then
@@ -1070,6 +1086,16 @@ ad_parse_distribution()
   ad_debug "licenseh: $licenseh"
 
   if test x$2 = xfalse; then
+    # Take rest of the stuff from top distribution
+
+    # We take precedence on defined and undefined distdefs.  Remove
+    # undefined distdefs if we have defined them.
+    for d in $defs
+    do
+      ad_debug "defining undefined $d distdef"
+      undistdefs=`echo $undistdefs | sed s/$d//g`
+    done
+
     # Get distribution name
     dname=`sed 's/^[   ]*//' < $distdir/$1 | grep -v "^#" \
       | grep "name " | cut -d' ' -f2-`
@@ -1556,7 +1582,10 @@ while test $# -gt 0; do
     fi
     ad_process_distdefs
     echo "Distdefs:" 1>&2;
-    echo "${distdefs}";
+    for i in $distdefs
+    do
+      echo "$i";
+    done
     exit 0;;
 
   -i | --init)