From 9c56a67d74a8a3196908dc6fa9acd6aefb5f32a1 Mon Sep 17 00:00:00 2001
From: Peter Marschall <peter@adpm.de>
Date: Sun, 22 Apr 2012 14:26:27 +0200
Subject: [PATCH] capiinit/capiinit.c: use 'configure'd path for capi.conf

Look for capi.conf in the path determined by configure at compile time
instead of the hard-coded /etc/capi.conf.

Beautification: replace 0 -> NULL in firmwarepath[] definition.
---
 capiinit/capiinit.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/capiinit/capiinit.c b/capiinit/capiinit.c
index 733713b6..b5077485 100644
--- a/capiinit/capiinit.c
+++ b/capiinit/capiinit.c
@@ -88,6 +88,12 @@
 #include <linux/kernelcapi.h>
 #include <getopt.h>
 
+#if defined(HAVE_CONFIG_H)
+# include "config.h"
+#else
+# define I4LCONFDIR	"/etc/isdn"
+#endif
+
 #define MODPROBE	"/sbin/modprobe"
 static char capidevnameold[] = "/dev/capi20";
 static char capidevnamenew[] = "/dev/isdn/capi20";
@@ -98,7 +104,7 @@ static char *firmwarepath[] = {
 	"/usr/share/isdn",
 	"/usr/lib/isdn",
 	"/lib/isdn",
-	0
+	NULL
 };
 
 /* ---------------- global variables --------------------------------- */
@@ -107,7 +113,7 @@ static int capifd = -1;
 
 static int patchdebug = 0;	/* -d || -debug */
 static int silent = 0;		/* -s || -silent */
-char *configfilename = "/etc/capi.conf";
+char *configfilename = I4LCONFDIR "/capi.conf";
 
 /* ---------------- utils -------------------------------------------- */