build: follow --sysconfdir configure arg (OPENZAP-58)

git-svn-id: http://svn.openzap.org/svn/openzap/trunk@744 a93c3328-9c30-0410-af19-c9cd2b2d52af

diff --git a/libs/freetdm/Makefile.am b/libs/freetdm/Makefile.am
index 964ae5c96e80b0683174b1a651a54570860672f8..a7d8f4a9ce4a86f12ce3fce28be3a7945e303ae2 100644 (file)
--- a/libs/freetdm/Makefile.am
+++ b/libs/freetdm/Makefile.am
@@ -37,7 +37,7 @@ libdir = $(PREFIX)/lib/
 library_includedir = $(PREFIX)/include
 
 INCS      = -I$(OZ_SRCDIR)/$(SRC)/include -I$(OZ_SRCDIR)/$(SRC)/isdn/include -I$(OZ_SRCDIR)/$(SRC)/ozmod/ozmod_ss7_boost 
-MY_CFLAGS = $(INCS) $(ZAP_CFLAGS) -DZAP_CONFIG_DIR=\"@prefix@/conf\" -DZAP_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@
+MY_CFLAGS = $(INCS) $(ZAP_CFLAGS) -DZAP_CONFIG_DIR=\"@confdir@\" -DZAP_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@
 COMPILE   = $(CC) $(MY_CFLAGS) $(INCS)
 LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
 LINK      = $(LIBTOOL) --mode=link --tag=CC $(CC) $(MY_CFLAGS) $(LDFLAGS) -o $@
@@ -231,6 +231,6 @@ mod_openzap-clean:
 
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(PREFIX)
-       $(mkinstalldirs) $(DESTDIR)$(PREFIX)/conf
-       @[ -f "$(DESTDIR)$(PREFIX)/conf/openzap.conf" ] || ( cp conf/*.conf $(DESTDIR)$(PREFIX)/conf)
+       $(mkinstalldirs) $(DESTDIR)@confdir@
+       @[ -f "$(DESTDIR)@confdir@/openzap.conf" ] || ( cp conf/*.conf $(DESTDIR)@confdir@)
        @echo OpenZAP Installed

diff --git a/libs/freetdm/configure.ac b/libs/freetdm/configure.ac
index f7a0576809e32a92e985a23b9c2d999b100ab8fe..e89564af7ae73ffa583e79ac0f328f3e4926b632 100644 (file)
--- a/libs/freetdm/configure.ac
+++ b/libs/freetdm/configure.ac
@@ -25,6 +25,14 @@ oz_builddir=`pwd`
 AC_SUBST(OZ_SRCDIR)
 AC_SUBST(oz_builddir)
 
+if test "$sysconfdir" = "\${prefix}/etc" ; then
+    confdir="$prefix/conf"
+else
+    confdir="$sysconfdir"
+fi
+
+AC_SUBST(confdir)
+
 #override some default libtool behavior and invoke AC_PROG_LIBTOOL (see http://lists.gnu.org/archive/html/libtool/2007-03/msg00000.html)
 m4_defun([_LT_AC_LANG_F77_CONFIG], [:])
 m4_defun([_LT_AC_LANG_GCJ_CONFIG], [:])