X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fninjahelper.in;h=5d6bdd9dae4dc3019821aa9267d6ba5271e090fc;hb=285f38ac3154898fcc63d21a1eace97c851356d5;hp=f0ad45a9685cc6d28fbafe883fefcaf35cee2638;hpb=13149b96008227bb11582fa0e0d59b727fd8d1bd;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/src/ninjahelper.in b/src/ninjahelper.in
index f0ad45a..5d6bdd9 100755
--- a/src/ninjahelper.in
+++ b/src/ninjahelper.in
@@ -187,24 +187,39 @@ if [ ! -r "$conffile" ]; then
 	echo "Configuration file $conffile not found." 
 	exit 1
 fi
+
+# find $scriptdir
 scriptdir=`grep scriptdirectory $conffile | awk '{print $3}'`
-if [ ! -n "$scriptdir" ]; then
-	echo "Cound not find entry 'scriptdirectory' in $conffile" 
-	exit 1
-fi
-if [ ! -d "$scriptdir" ]; then
-	echo "Script directory $scriptdir not found." 
-	exit 1
+if [ -z "$scriptdir" ]; then
+        if [ -d "@datadir@" ]; then
+	   scriptdir="@datadir@"
+	else
+	   echo "Could not find entry 'scriptdirectory' in $conffile" 
+	   exit 1
+	fi
+else
+        if [ ! -d "$scriptdir" ]; then
+	   echo "Script directory $scriptdir not found." 
+	   exit 1
+	fi	   
 fi
+
+# find $libdir
 libdir=`grep libdirectory $conffile | awk '{print $3}'`
-if [ ! -n "$libdir" ]; then
-	echo "Cound not find entry 'libdirectory' in $conffile" 
-	exit 1
-fi
-if [ ! -d "$libdir" ]; then
-	echo "Script directory $libdir not found." 
-	exit 1
+if [ -z "$libdir" ]; then
+        if [ -d "@libdir@" ]; then
+	   libdir="@libdir@"
+	else
+	   echo "Could not find entry 'libdirectory' in $conffile." 
+	   exit 1
+	fi
+else
+        if [ ! -d "$libdir" ]; then
+	   echo "Lib directory $libdir not found." 
+	   exit 1
+	fi
 fi
+
 configdirectory=`grep configdirectory $conffile | awk '{print $3}'`
 if [ ! -n "$configdirectory" ]; then
 	echo "Cound not find entry 'configdirectory' in $conffile"