Match distdefs exactly.

diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES
index 163b58acd2df2f4b6f2f997e58ac630fa06ada2d..29702ee6733f316f913d7949dca7653590ebf1ae 100644 (file)
--- a/apps/autodist/CHANGES
+++ b/apps/autodist/CHANGES
@@ -1,6 +1,6 @@
-Wed Nov 16 17:53:55 EET 2005 Pekka Riikonen <priikone@silcnet.org>
+Sat Jun 24 23:38:24 EEST 2006 Pekka Riikonen <priikone@silcnet.org>
 
-       * Don't try to log with -s option.
+       * Match distdef names exactly (/^foo$/ instead of /^foo/).
 
 Wed May  4 10:58:24 EEST 2005 Pekka Riikonen <priikone@silcnet.org>
 

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 8ecb68dddf499ad4aa54561aaf477752d84a8eb7..8b30e67f0f5716fc2de52affe9e9f35bfee17f96 100755 (executable)
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -1554,9 +1554,9 @@ ad_process_file()
     # This also handles the #ifdef's #else (ie. #ifndef) branch.
     if test x$found = xfalse; then
       ad_debug "ifdef $d will be excluded (it is NOT defined)"
-      echo "/^#ifdef $d/,/^#else !$d|^#endif $d/ { next; }" >> $f
+      echo "/^#ifdef $d$/,/^#else !$d$|^#endif $d$/ { next; }" >> $f
     else
-      echo "/^#else !$d/,/^#endif $d/ { next; }" >> $f
+      echo "/^#else !$d$/,/^#endif $d$/ { next; }" >> $f
     fi
   done
 
@@ -1577,9 +1577,9 @@ ad_process_file()
     # This also handles the #ifndef's #else (ie. #ifdef) branch.
     if test x$found = xtrue; then
       ad_debug "ifndef $d will be excluded (it IS defined)"
-      echo "/^#ifndef $d/,/^#else $d|^#endif $d/ { next; }" >> $f
+      echo "/^#ifndef $d$/,/^#else $d$|^#endif $d$/ { next; }" >> $f
     else
-      echo "/^#else $d/,/^#endif $d/ { next; }" >> $f
+      echo "/^#else $d$/,/^#endif $d$/ { next; }" >> $f
     fi
   done
 
@@ -1665,9 +1665,9 @@ ad_process_source_file()
     # This also handles the #ifdef's #else (ie. #ifndef) branch.
     if test x$found = xfalse; then
       ad_debug "ifdef $d will be excluded (it is NOT defined)"
-      echo "/^#ifdef $d/,/^#else \/\* \!$d|^#endif \/\* $d/ { next; }" >> $f
+      echo "/^#ifdef $d$/,/^#else \/\* \!$d |^#endif \/\* $d / { next; }" >> $f
     else
-      echo "/^#else \/\* \!$d/,/^#endif \/\* $d/ { next; }" >> $f
+      echo "/^#else \/\* \!$d /,/^#endif \/\* $d / { next; }" >> $f
     fi
   done
 
@@ -1688,9 +1688,9 @@ ad_process_source_file()
     # This also handles the #ifndef's #else (ie. #ifdef) branch.
     if test x$found = xtrue; then
       ad_debug "ifndef $d will be excluded (it IS defined)"
-      echo "/^#ifndef $d/,/^#else \/\* $d|^#endif \/\* $d/ { next; }" >> $f
+      echo "/^#ifndef $d$/,/^#else \/\* $d |^#endif \/\* $d / { next; }" >> $f
     else
-      echo "/^#else \/\* $d/,/^#endif \/\* $d/ { next; }" >> $f
+      echo "/^#else \/\* $d /,/^#endif \/\* $d / { next; }" >> $f
     fi
   done
 
@@ -1871,7 +1871,6 @@ while test $# -gt 0; do
 
   -s | --distdefs)
     shift;
-    nolog=true
     if test $# -eq 0; then
       ad_parse_distribution $distribution false
       echo "Distribution: ${distribution}" 1>&2;