Skip to contentSkip to conversation

librdmacm: fix make install

PATCH In review Jonathan Rosser 2 participants 4 messages Oct 22, 2010 – Oct 25, 2010 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 librdmacm: fix make install

make install fails if the include files in the install prefix include/rdma,infiniband already exist. install claims that the <src> and <destination> file are the same and exits with an error.

This patch modifies Makefile.am so that the rdma and infiniband include files explicitly reference the source directory rather than the build directory.

Also, EXTRA_DIST now only lists files that are not referenced anywhere else in Makefile.am

---
 Makefile.am |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
Makefile.am +5 -7
index 2668aa3..8790fe8 100644
@@ -35,11 +35,11 @@ examples_rdma_server_LDADD = $(top_builddir)/src/librdmacm.la
 librdmacmincludedir = $(includedir)/rdma
 infinibandincludedir = $(includedir)/infiniband
 
-librdmacminclude_HEADERS = include/rdma/rdma_cma_abi.h \
-			   include/rdma/rdma_cma.h \
-			   include/rdma/rdma_verbs.h
+librdmacminclude_HEADERS = $(top_srcdir)/include/rdma/rdma_cma_abi.h \
+			   $(top_srcdir)/include/rdma/rdma_cma.h \
+			   $(top_srcdir)/include/rdma/rdma_verbs.h
 
-infinibandinclude_HEADERS = include/infiniband/ib.h
+infinibandinclude_HEADERS = $(top_srcdir)/include/infiniband/ib.h
 
 man_MANS = \
 	man/rdma_accept.3 \
@@ -97,9 +97,7 @@ man_MANS = \
 	man/rdma_client.1 \
 	man/rdma_cm.7
 
-EXTRA_DIST = include/rdma/rdma_cma_abi.h include/rdma/rdma_cma.h \
-	     include/infiniband/ib.h include/rdma/rdma_verbs.h \
-	     src/cma.h src/librdmacm.map librdmacm.spec.in $(man_MANS)
+EXTRA_DIST = src/cma.h src/librdmacm.map librdmacm.spec.in $(man_MANS)
 
 dist-hook: librdmacm.spec
 	cp librdmacm.spec $(distdir)
Signature · 6 lines
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): CF9C39F99A89134C9CF9C4CCB68B8DDF25B809B18A-osO9UTpF0USkrb+BlOpmy7fspsVTdybXVpNB7YpNyf8@public.gmane.org

#3 lore raw

make install fails if the include files in the install prefix include/rdma,infiniband already exist. install claims that the <src> and <destination> file are the same and exits with an error.

This patch modifies Makefile.am so that the rdma and infiniband include files explicitly reference the source directory rather than the build directory.

Also, EXTRA_DIST now only lists files that are not referenced anywhere else in Makefile.am

---
 Makefile.am |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
Makefile.am +5 -7
index 2668aa3..8790fe8 100644
@@ -35,11 +35,11 @@ examples_rdma_server_LDADD = $(top_builddir)/src/librdmacm.la
 librdmacmincludedir = $(includedir)/rdma
 infinibandincludedir = $(includedir)/infiniband
 
-librdmacminclude_HEADERS = include/rdma/rdma_cma_abi.h \
-                          include/rdma/rdma_cma.h \
-                          include/rdma/rdma_verbs.h
+librdmacminclude_HEADERS = $(top_srcdir)/include/rdma/rdma_cma_abi.h \
+                          $(top_srcdir)/include/rdma/rdma_cma.h \
+                          $(top_srcdir)/include/rdma/rdma_verbs.h
 
-infinibandinclude_HEADERS = include/infiniband/ib.h
+infinibandinclude_HEADERS = $(top_srcdir)/include/infiniband/ib.h
 
 man_MANS = \
        man/rdma_accept.3 \
@@ -97,9 +97,7 @@ man_MANS = \
        man/rdma_client.1 \
        man/rdma_cm.7
 
-EXTRA_DIST = include/rdma/rdma_cma_abi.h include/rdma/rdma_cma.h \
-            include/infiniband/ib.h include/rdma/rdma_verbs.h \
-            src/cma.h src/librdmacm.map librdmacm.spec.in $(man_MANS)
+EXTRA_DIST = src/cma.h src/librdmacm.map librdmacm.spec.in $(man_MANS)
 
 dist-hook: librdmacm.spec
        cp librdmacm.spec $(distdir)
Signature · 6 lines
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#4 lore raw
Quoted 4 lines · Jonathan Rosser

Signed-off-by: Jonathan Rosser
<jrosser-gjMux1o1B1/[email protected]>
---

Oh right. gmane obfuscates my address in the patch too. Ho-hum.

Replace with jonathan.rosser @ rd. bbc. co. uk for a real address.

Sorry about that.

Regards,
Jonathan.

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html