From: Michael Wagner <michael@wagnertech.de>
Date: Mon, 12 Mar 2018 07:31:11 +0000 (+0100)
Subject: posaune
X-Git-Tag: sysd2sysv_0.1-1~2^2~8
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=5430e52c52a1918b8b337c5ad2b9982a83097a7d;p=projects.git

posaune
---

diff --git a/debian/mbuild.cp b/debian/mbuild.cp
new file mode 120000
index 0000000..ee9aa00
--- /dev/null
+++ b/debian/mbuild.cp
@@ -0,0 +1 @@
+../etc/mbuild.cp
\ No newline at end of file
diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index a5e9297..d49601e 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -2,7 +2,7 @@
 set -e
 
 function echo_usage {
-	echo "usage: configure <package> [options]"
+	echo "usage: mconfigure <package> [options]"
 	echo "	-a <arch>"
 }
 
@@ -29,6 +29,8 @@ then
 	exit 1
 fi
 
+#TODO: check, if running in debian-dir
+
 paket=$1
 shift
 ARCH=""
@@ -38,31 +40,31 @@ delete_src=1
 set_build
 echo "building $paket with build $build"
 
-while getopts ":a" opt; do
-	case $opt in
-		a) ARCH=$OPTARG
-			;;
-		\?) echo "Invalid option: -$OPTARG"
-			echo_usage
-			exit 1
-			;;
-		:) echo "Option -$OPTARG requires an argument."
-			echo_usage
-			exit 1
-			;;
-	esac
-done
-
-# clean dirs and check out
-if [ -d build -a $delete_src -eq 1 ]
-then
-	rm -rf build
-fi
-
-mkdir -p build
-pushd build >/dev/null
-
-ln -sf /usr/share/mbuild/makefile .
+#while getopts ":a" opt; do
+#	case $opt in
+#		a) ARCH=$OPTARG
+#			;;
+#		\?) echo "Invalid option: -$OPTARG"
+#			echo_usage
+#			exit 1
+#			;;
+#		:) echo "Option -$OPTARG requires an argument."
+#			echo_usage
+#			exit 1
+#			;;
+#	esac
+#done
+#
+## clean dirs and check out
+#if [ -d build -a $delete_src -eq 1 ]
+#then
+#	rm -rf build
+#fi
+#
+#mkdir -p build
+#pushd build >/dev/null
+#
+#ln -sf /usr/share/mbuild/makefile .
 
 if [ -e $paket ]
 then
@@ -80,7 +82,7 @@ then
 fi
 
 # copy package control
-control=$(find -L src -name $paket.control)
+control=$(find .. -name $paket.control)
 build_number=${build#*_}
 if [ -z "$control" ]
 then
@@ -95,7 +97,7 @@ else
 fi
 
 # check for copy file
-copy=$(find -L src -name $paket.cp)
+copy=$(find .. -name $paket.cp)
 if [ -n "$copy" ]
 then
 	ln -sf $copy .
@@ -105,32 +107,32 @@ else
 fi
 
 # check for installation scripts
-files=$(find src -name $paket.preinst)
-files="$files $(find -L src -name $paket.postinst)"
-files="$files $(find -L src -name $paket.prerm)"
-files="$files $(find -L src -name $paket.postrm)"
+files=$(find .. -name $paket.preinst)
+files="$files $(find .. -name $paket.postinst)"
+files="$files $(find .. -name $paket.prerm)"
+files="$files $(find .. -name $paket.postrm)"
 for file in $files
 do
 	ln -sf $file .
 done
 
 # create generic make.pre, if not existing
-if [ ! -f make.pre ]
-then
-	cat  >>make.pre <<MAKE_PRE
-# mBuild make.pre script (auto generated)
-project = $paket
-COPY = ./$paket.cp
-MAKE_PRE
-	if [ -n "$ARCH" ]
-	then
-		echo "arch = $ARCH" >>make.pre
-		echo "_arch = _${ARCH}" >>make.pre
-	fi
-	echo "make.pre written."
-fi
-
-# append version to make.pre
-echo "version = $version" >> make.pre
-echo "build = $build" >> make.pre
+#if [ ! -f make.pre ]
+#then
+#	cat  >>make.pre <<MAKE_PRE
+## mBuild make.pre script (auto generated)
+#project = $paket
+#COPY = ./$paket.cp
+#MAKE_PRE
+#	if [ -n "$ARCH" ]
+#	then
+#		echo "arch = $ARCH" >>make.pre
+#		echo "_arch = _${ARCH}" >>make.pre
+#	fi
+#	echo "make.pre written."
+#fi
+#
+## append version to make.pre
+#echo "version = $version" >> make.pre
+#echo "build = $build" >> make.pre