From: Michael Wagner <michael@wagnertech.de>
Date: Fri, 6 Aug 2021 21:21:32 +0000 (+0200)
Subject: posaune
X-Git-Tag: v_0.0-2~3
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b2f9d0dd4ac7745735ddda9260bbac1ca6936859;p=projects.git

posaune
---

diff --git a/debian/mbuild.cp b/debian/mbuild.cp
index 9e8f3b8..1421fb3 100755
--- a/debian/mbuild.cp
+++ b/debian/mbuild.cp
@@ -6,7 +6,7 @@ base=$1
 mkdir -p $base/usr/bin/
 cp tools/make/mconfigure $base/usr/bin/
 cp tools/make/treecopy $base/usr/bin/
-cp tools/make/make-conffile $base/usr/bin/
+cp tools/make/create-conffiles $base/usr/bin/
 
 mkdir -p $base/usr/share/mbuild/
 cp tools/make/rules $base/usr/share/mbuild/
diff --git a/doc/mbuild.8 b/doc/mbuild.8
index b1d4ef6..4b57e02 100644
--- a/doc/mbuild.8
+++ b/doc/mbuild.8
@@ -57,10 +57,11 @@ file are needed in the debian directory. If pre/post installation scripts
 are needed, these files must be also placed in the
 .B debian 
 directory.
-.br
+
 A standard copyright file is included. An user defined file can be used by copying it to debian/copyright
 in the PAKET.prepare script.
-.br
+
+If files are present to be placed unter /etc a conffiles is creates to avoid changes made by the administrator.
 
 .SH FILES
 .TP
diff --git a/tools/make/create-conffiles b/tools/make/create-conffiles
index 54567f9..258a350 100755
--- a/tools/make/create-conffiles
+++ b/tools/make/create-conffiles
@@ -7,8 +7,11 @@ if [ $# -ne 1 ]; then
 fi
 
 cd $1
-mkdir -p DEBIAN
-for files in $(find etc -type f); do
-	echo "/$files" >> DEBIAN/conffiles
-done
+if [ -d etc ]
+then
+	mkdir -p DEBIAN
+	for files in $(find etc -type f); do
+		echo "/$files" >> DEBIAN/conffiles
+	done
+fi
 
diff --git a/tools/make/mconfigure b/tools/make/mconfigure
index e5f11b3..244d19b 100755
--- a/tools/make/mconfigure
+++ b/tools/make/mconfigure
@@ -249,7 +249,7 @@ then
 #	pwd=${pwd,,*}
 #	echo "pwd=$pwd" >> debian/rules.pre
 
-	echo "building $paket with build $version-$build"
+	echo "building $paket with version/build=$version-$build"
 
 	pushd debian >/dev/null
 	# ./debian -------------------------------------
@@ -355,7 +355,7 @@ then
 			echo 'arch = ${DEB_HOST_ARCH}' >> debian/rules.pre
 			echo "BINARY_ARCH = copy ../${paket}_$version-${build}_"'$(arch).deb' >> debian/rules.pre
 		fi
-		if ! [ -f $paket.changelog ]
+		if ! [ -f debian/$paket.changelog ]
 		then
 			echo "changelog_source = debian/default.changelog" >> debian/rules.pre
 			if [ -f debian/default.changelog ]
diff --git a/tools/make/rules b/tools/make/rules
index 6b7d688..bd3cf57 100755
--- a/tools/make/rules
+++ b/tools/make/rules
@@ -9,7 +9,7 @@ INSERT_BUILD = /usr/share/mbuild/insert_build.sh
 RSYNC_OPT = -av --exclude="build" --exclude="debian/tmp" --exclude="Packages" --exclude="*Aktuell" --exclude=".*"
 
 std_inst_tgt = debian/tmp/usr/share/doc/$(paket)/copyright debian/tmp/usr/share/doc/$(paket)/README.debian
-changelog_source = $(paket).changelog
+changelog_source = debian/$(paket).changelog
 
 include debian/rules.pre