X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/projects.git/blobdiff_plain/c9b0630e680308a6389cdf758bb677d811a2d05b..352bc51510edff4ff4074f6ea246cb661a075454:/tools/make/configure

diff --git a/tools/make/configure b/tools/make/configure
index 9064c93..cb61a75 100755
--- a/tools/make/configure
+++ b/tools/make/configure
@@ -10,7 +10,7 @@ function echo_usage {
 # to build a package you need ...
 # <package>.co: checkout commands
 # <package>.cp (optional): copy step for package production
-# <package>.cpp (optional): commands to setup the C++ compile environment
+# <package>.cpp.sh (optional): commands to setup the C++ compile environment
 
 if [ $# -lt 2 ]
 then
@@ -35,25 +35,24 @@ then
 	echo "file $paket.co missing or not executable."
 	exit 1
 fi
-if [ ! -x $paket.cp ]
-then
-	echo "warning: file $paket.cp missing or not executable:"
-	echo "  this file is necessary for any package production."
-fi
 
-# load util functions for C/C++ - build
-if [ -f $paket.cpp ]
+# clean dirs and check out
+if [ -d src ]
 then
-	cpp_build=1
-	. Make/c_configure.sh
+	echo "Shall I delete src dir? [y]/n"
+	read key
+	if [ "$key" != "n" ]
+	then
+		rm -rf src
+	fi
 fi
 
-# clean dirs and check out
 if [ -e $paket ]
 then
 	rm -rf $paket
 fi
 rm *.stamp || true
+rm make.pre || true
 
 mkdir -p src
 cwd=$(pwd)
@@ -63,6 +62,14 @@ pushd src >/dev/null
 	../$paket.co $build
 popd >/dev/null
 
+# load util functions for C/C++ - build
+if [ -f $paket.cpp.sh ]
+then
+	cpp_build=1
+	. projects/tools/make/c_configure.sh
+	. $paket.cpp.sh
+fi
+
 # copy package control
 control=$(find src -name $paket.control)
 if [ -z "$control" ]
@@ -70,13 +77,23 @@ then
 	echo "warning: control file not found"
 	echo "  this file is necessary for any package production."
 else	
-	sed "s/%BUILD%/$build/" $control >$paket.control
+	sed "s/%BUILD%/$build/" $control |sed "s/%ARCH%/$ARCH/" >$paket.control
 	echo "$paket.control written."
 
 	# extract version
 	version=$(grep Version $paket.control |sed "s/Version: //")
 fi
 
+# check for copy file
+copy=$(find src -name $paket.cp)
+if [ -n "$copy" ]
+then
+	ln -sf $copy .
+else
+	echo "warning: file $paket.cp missing or not executable:"
+	echo "  this file is necessary for any package production."
+fi
+
 # check for postinst
 postinst=$(find src -name $paket.postinst)
 if [ -n "$postinst" ]
@@ -90,9 +107,11 @@ then
 	cat  >>make.pre <<MAKE_PRE
 # mBuild make.pre script (auto generated)
 project = $paket
-version = $version
 COPY = ./$paket.cp
 MAKE_PRE
 	echo "make.pre written."
 fi
 
+# append version to make.pre
+echo "version = $version" >> make.pre
+