build: $(DESTDIR) prepend needed on install hooks for dat.conf

All install directives that automake creates automatically
have $(DESTDIR) prepended to them so that a make
DESTDIR=<some_path> install will work. The hand written
install hooks for dat.conf was missing DESTDIR.

Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 29e6b3b06acc8862be415ffe750b898a6a325fb7..1dd996c60a2dc45b3bb1cd183435cdcfc8eae104 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -383,22 +383,25 @@ dist-hook: dapl.spec
        cp dapl.spec $(distdir)
 
 install-exec-hook:
-       if test -e $(sysconfdir)/dat.conf; then \
+       if ! test -d $(DESTDIR)$(sysconfdir); then \
+               mkdir -p $(DESTDIR)$(sysconfdir); \
+       fi; \
+       if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \
                echo "exec-hook"; \
-               sed -e '/OpenIB-.*/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \
-               cp /tmp/$$$$OpenIBdapl $(sysconfdir)/dat.conf; \
+               sed -e '/OpenIB-.*/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \
+               cp /tmp/$$$$OpenIBdapl $(DESTDIR)$(sysconfdir)/dat.conf; \
        fi; \
-       echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> $(sysconfdir)/dat.conf; \
-       echo OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib1 0" ""' >> $(sysconfdir)/dat.conf; \
-        echo OpenIB-mthca0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> $(sysconfdir)/dat.conf; \
-        echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> $(sysconfdir)/dat.conf; \
-        echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> $(sysconfdir)/dat.conf; \
-        echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> $(sysconfdir)/dat.conf;
+       echo OpenIB-cma u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib0 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \
+       echo OpenIB-cma-1 u1.2 nonthreadsafe default libdaplcma.so.1 dapl.1.2 '"ib1 0" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \
+        echo OpenIB-mthca0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \
+        echo OpenIB-mthca0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mthca0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \
+        echo OpenIB-mlx4_0-1 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 1" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf; \
+        echo OpenIB-mlx4_0-2 u1.2 nonthreadsafe default libdaplscm.so.1 dapl.1.2 '"mlx4_0 2" ""' >> $(DESTDIR)$(sysconfdir)/dat.conf;
 
 uninstall-hook:
-       if test -e $(sysconfdir)/dat.conf; then \
-               sed -e '/OpenIB-.* u1/d' < $(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \
-               cp /tmp/$$$$OpenIBdapl $(sysconfdir)/dat.conf; \
+       if test -e $(DESTDIR)$(sysconfdir)/dat.conf; then \
+               sed -e '/OpenIB-.* u1/d' < $(DESTDIR)$(sysconfdir)/dat.conf > /tmp/$$$$OpenIBdapl; \
+               cp /tmp/$$$$OpenIBdapl $(DESTDIR)$(sysconfdir)/dat.conf; \
        fi;
        
 SUBDIRS = . test/dtest test/dapltest

diff --git a/dapl.spec.in b/dapl.spec.in
index 8c8f62a0aedd05cf7e461b91f5a28e8976a9a35e..b3d103e1374496ea3875671bbb9af8118dfc7a26 100644 (file)
--- a/dapl.spec.in
+++ b/dapl.spec.in
@@ -83,6 +83,7 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 # remove unpackaged files from the buildroot
 rm -f %{buildroot}%{_libdir}/*.la
+rm -f %{buildroot}%{_sysconfdir}/*.conf
 
 %clean
 rm -rf %{buildroot}