1 files changed, 7 insertions, 14 deletions
diff --git a/newapkbuild.in b/newapkbuild.in
index 1a41ae9..0f95f19 100755
--- a/newapkbuild.in
+++ b/newapkbuild.in
@@ -6,22 +6,15 @@
 # Distributed under GPL-2
 #
 
-version=@VERSION@
-sysconfdir=@sysconfdir@
+abuild_ver=@VERSION@
 datadir=@datadir@
 
-prog=${0##*/}
+if ! [ -f "$datadir/functions.sh" ]; then
+	echo "$datadir/functions.sh: not found" >&2
+	exit 1
+fi
+. "$datadir/functions.sh"
 
-# Source $PACKAGER
-for i in $sysconfdir/abuild.conf $HOME/.abuild/abuild.conf; do
-	if [ -f "$i" ]; then
-		. $i
-	fi
-done
-
-error() {
-	echo "$@" >&2
-}
 
 is_url() {
 	case "$1" in
@@ -260,7 +253,7 @@ __EOF__
 }
 
 usage() {
-	echo "$prog $version"
+	echo "$prog $abuild_ver"
 	echo "usage: $prog [-cfh] [-d DESC] [-l LICENSE] [-n NAME] [-u URL] PKGNAME[-PKGVER]|SRCURL"
 	echo "Options:"
 	echo " -a  Create autotools (use ./configure ...)"