From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 5 Apr 2012 18:31:28 +0000 (-0700)
Subject: Refresh of daemonize
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=eee41d0606a288262e75ca7e1d206082dfd3b48c;p=~shefty%2Fibacm.git

Refresh of daemonize
---

diff --git a/Makefile.am b/Makefile.am
index 875889a..c5efa7c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
 
-AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\" -DBINDIR=\"$(bindir)\"
+AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\" -DBINDIR=\"$(bindir)\" -DRDMADIR=\"${rdmadir}\"
 
 bin_PROGRAMS = util/ib_acme
 sbin_PROGRAMS = svc/ibacm
@@ -23,7 +23,7 @@ EXTRA_DIST = src/acm_mad.h src/libacm.h ibacm.init \
 	     ibacm_addr.cfg
 
 install-exec-hook:
-	install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacmd;
+	install -D -m 755 ibacm.init $(DESTDIR)$(sysconfdir)/init.d/ibacm;
 
 dist-hook: ibacm.spec
 	cp ibacm.spec $(distdir)
diff --git a/ibacm.spec.in b/ibacm.spec.in
index ee7d187..88dad4f 100644
--- a/ibacm.spec.in
+++ b/ibacm.spec.in
@@ -47,7 +47,7 @@ wish to make use of this header file.
 %build
 aclocal -I config && libtoolize --force --copy && autoheader && \
 	automake --foreign --add-missing --copy && autoconf
-%configure --rdmadir=rdma CFLAGS="$CXXFLAGS -fno-strict-aliasing" LDFLAGS=-lpthread
+%configure CFLAGS="$CXXFLAGS -fno-strict-aliasing" LDFLAGS=-lpthread
 make %{?_smp_mflags}
 
 %install
diff --git a/linux/osd.h b/linux/osd.h
index 169e041..e2424b4 100644
--- a/linux/osd.h
+++ b/linux/osd.h
@@ -51,7 +51,10 @@
 #ifndef BINDIR
 #define BINDIR "/usr/bin"
 #endif
-#define ACM_CONF_DIR  SYSCONFDIR "/rdma"
+#ifndef RDMADIR
+#define RDMADIR "rdma"
+#endif
+#define ACM_CONF_DIR  SYSCONFDIR "/" RDMADIR
 #define ACM_ADDR_FILE "ibacm_addr.cfg"
 #define ACM_OPTS_FILE "ibacm_opts.cfg"