Refresh of daemonize

diff --git a/Makefile.am b/Makefile.am
index 875889ae5249bef5a97ef3381ddbbe7aa0de8aa1..c5efa7c0d288f9aed239fbdd6e4d1a71d101bcde 100644 (file)
--- 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 ee7d18721ad1a0ea651c66d228dd984f6fe52c2c..88dad4f3db7be84d8ab3518440a1385bddabf26a 100644 (file)
--- 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 169e0411ee7dedd169fb4bbb90a0c1200efe6603..e2424b497c670a76a747612f9e84854fcbb581a9 100644 (file)
--- a/linux/osd.h
+++ b/linux/osd.h
@@ -51,7 +51,10 @@
 #ifndef BINDIR\r
 #define BINDIR "/usr/bin"\r
 #endif\r
-#define ACM_CONF_DIR  SYSCONFDIR "/rdma"\r
+#ifndef RDMADIR\r
+#define RDMADIR "rdma"\r
+#endif\r
+#define ACM_CONF_DIR  SYSCONFDIR "/" RDMADIR\r
 #define ACM_ADDR_FILE "ibacm_addr.cfg"\r
 #define ACM_OPTS_FILE "ibacm_opts.cfg"\r
 \r