Fixed *.ad (not configure.ad or Makefile.ad but other files)

	to correctly remove trailing slashes and copy the processed file.

diff --git a/apps/autodist/CHANGES b/apps/autodist/CHANGES
index 08898ce07974c5b50e19649130ab8a996c8c06dd..4df53681ac0f35832fe6997089d5143172baa542 100644 (file)
--- a/apps/autodist/CHANGES
+++ b/apps/autodist/CHANGES
@@ -1,3 +1,9 @@
+Wed Jan 16 17:17:41 EET 2008 Pekka Riikonen <priikone@silcnet.org>
+
+       * Fixed *.ad (excluding configure.ad and Makefile.ad files)
+         processing to correctly remove trailing backslashes and
+         copy the processed file to new name.
+
 Thu Sep 13 18:50:00 EEST 2007 Pekka Riikonen <priikone@silcnet.org>
 
        * Fixed prerequisite version checking to work on all shells.

diff --git a/apps/autodist/autodist.in b/apps/autodist/autodist.in
index 16a789ac514ac78ad956958a9860192d7134c420..3154d5ffaceb7afe0fbbb83c097bed4caa240fdf 100755 (executable)
--- a/apps/autodist/autodist.in
+++ b/apps/autodist/autodist.in
@@ -565,16 +565,22 @@ ad_process_ads()
   for i in $files
   do
     fname=`echo $i | sed s/\.ad//`
+    orig=$i
 
     ad_debug "Processing $i to be $fname"
     ad_log "  $i into $fname"
 
     # Run the distribution processing for this file
-    ad_process_file $i $fname false
-    if test -f $fname; then
-      cp -p $i $fname || exit 1
+    ad_process_file $i $fname.tmp false
+
+    # Remove any trailing backslashes
+    if test -f "$fname.tmp"; then
+      sed -e :a -e '/\\$/N; s/[        ]*\\\n//; ta' < $fname.tmp > $fname
+    else
+      cp -p $orig $fname || exit 1
     fi
 
+    rm -f $fname.tmp
   done
   ad_log ""