X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=tools%2Fmake%2Fconfigure;fp=tools%2Fmake%2Fconfigure;h=2eb9f91e87c1177d6268ccc16f694bd9253a8ec1;hb=821fa83fccab0589fb06f6c111768dfcb78bf4f7;hp=acf16cbb1f54bbbcb1637a8a5e7a8699cd9d6633;hpb=20db6e0ee1b887b3e1a6ddbd420419d83f192bca;p=projects.git

diff --git a/tools/make/configure b/tools/make/configure
index acf16cb..2eb9f91 100755
--- a/tools/make/configure
+++ b/tools/make/configure
@@ -74,6 +74,14 @@ function check_unversioned {
 		echo "debian.*" >> .cm.ignore
 		echo "up.*" >> .cm.ignore
 	fi
+
+	# add auto created files to .cm.ignore
+	if ! grep Makefile .cm.ignore >/dev/null ; then echo "Makefile" >>.cm.ignore; fi
+	if ! grep configure .cm.ignore >/dev/null ; then echo "configure" >>.cm.ignore; fi
+	if ! grep debian/rules .cm.ignore >/dev/null ; then echo "debian/rules" >>.cm.ignore; fi
+	if ! grep debian/rules.pre .cm.ignore >/dev/null ; then echo "debian/rules.pre" >>.cm.ignore; fi
+	if ! grep debian/setenv.sh .cm.ignore >/dev/null ; then echo "debian/setenv.sh" >>.cm.ignore; fi
+	if ! grep debian/tmp .cm.ignore >/dev/null ; then echo "debian/tmp" >>.cm.ignore; fi
 	
 	project=$(pwd)
 	project=${project##*/}
@@ -81,7 +89,7 @@ function check_unversioned {
 		mCM $project -b -an > /dev/null
 		wc=$(wc $project.batch)
 		rm $project.batch
-		if [ "${wc:0:5}" != "0 0 0" ]
+		if [ "${wc:0:1}" != "1" ]
 		then
 			echo "M"
 		fi
@@ -221,10 +229,10 @@ then
 fi
 
 # read build configuration, if existing
-if [ -f debian/$paket.conf ]
-then
-	. debian/$paket.conf
-fi
+#if [ -f debian/$paket.conf ]
+#then
+#	. debian/$paket.conf
+#fi
 
 if [ -n "$ARCH" -a -n "$cross" ]
 then
@@ -362,14 +370,14 @@ else
 		cp debian/rules.pre $BUILD_DIR/$compile_dir/make.pre
 		pushd $BUILD_DIR/$compile_dir >/dev/null
 			ln -sf /usr/share/mbuild/makefile .
-#			if [ -n "$sources_suffix" ]
-#			then
-#				echo "SOURCES = \\" >> make.pre
-#				for suf in $sources_suffix
-#				do
-#					find . -name "*.$suf" -exec echo "  "{}" \\" >> make.pre \;
-#				done
-#				echo >> make.pre
+			if [ -n "$sources_suffix" ]
+			then
+				echo "SOURCES = \\" >> make.pre
+				for suf in $sources_suffix
+				do
+					find . -name "*.$suf" -exec echo "  "{}" \\" >> make.pre \;
+				done
+				echo >> make.pre
 			fi
 		popd >/dev/null
 	fi
@@ -381,6 +389,7 @@ else
 			add_sources tex xml
 			echo >> make.pre
 		popd >/dev/null
+	fi
 	if [ -x debian/$paket.prebuild ]
 	then
 		pushd $BUILD_DIR >/dev/null