From: dtrg <none@none>
Date: Sat, 24 Feb 2007 02:05:56 +0000 (+0000)
Subject: Removed some bashish; added comment support; removed the make
X-Git-Tag: release-6-0-pre-1~21
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=d2c505ad6bc435cd612987356d51cd5c3ec823b4;p=ack.git

Removed some bashish; added comment support; removed the make
distr functionality, as nothing was using it any more and it was
causing problems.
---

diff --git a/distr/mkdist b/distr/mkdist
index c4a307367..c6fe24daa 100755
--- a/distr/mkdist
+++ b/distr/mkdist
@@ -79,6 +79,7 @@ process_dir() {
 	
 	path=$1
 	cd $path
+	echo $PWD
 	
 	# Look for a LIST file and cache the first line.
 	
@@ -88,7 +89,10 @@ process_dir() {
 	fi
 
 	for i in `cat $path/.distr`; do
-		if [ -d $i ]; then
+		if [ "${i:0:1}" = "#" ]; then
+			# Comment. Do nothing.
+			true
+		elif [ -d $i ]; then
 			# This is a directory. Recurse into it.
 			
 			( process_dir $path/$i )
@@ -102,20 +106,8 @@ process_dir() {
 			$arch cDr `cat LIST`
 			addfile $path/$archivename
 		else
-		(
-			PATH=$PATH:.
-			export PATH
-			make distr || make $i || (
-				echo "Don't know what to do with $i, listed in $1/.distr."
-				exit 1
-			)
-			
-			if [ ! -f "$path/$i" ]; then
-				echo "Make failed for $i, listed in $path/.distr"
-				exit 1
-			fi
-			addfile $path/$i
-		)
+			echo "Don't know what to do with $i, listed in $PWD/.distr."
+			exit 1
 		fi
 	done
 }
@@ -158,7 +150,12 @@ echo "Done."
 
 # Revision history
 # $Log$
-# Revision 1.2  2005-06-24 23:19:23  dtrg
+# Revision 1.3  2007-02-24 02:05:56  dtrg
+# Removed some bashish; added comment support; removed the make
+# distr functionality, as nothing was using it any more and it was
+# causing problems.
+#
+# Revision 1.2  2005/06/24 23:19:23  dtrg
 # Added new mkdist tool.
 #
 # Revision 1.1  2005/06/24 22:13:57  dtrg