ibacm: fixup package name and installation for inclusion into OFED

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/Makefile.am b/Makefile.am
index 46f68d4e82ad78f9b0a1ce58f495eb55a2d60460..f36c08677895627c1010e334541cf4dea06db11e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,14 +8,17 @@ util_ib_acme_SOURCES = src/acme.c linux/acme_linux.c src/libacm.c linux/libacm_l
 svc_ib_acm_CFLAGS = $(AM_CFLAGS)
 util_ib_acme_CFLAGS = $(AM_CFLAGS)
 
-ib_acmincludedir = $(includedir)/infiniband
+ibacmincludedir = $(includedir)/infiniband
 
-ib_acminclude_HEADERS = include/infiniband/acm.h
+ibacminclude_HEADERS = include/infiniband/acm.h
 
 man_MANS = \
        man/ib_acme.1 \
        man/ib_acm.1 \
        man/ib_acm.7
 
-EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h linux/osd.h linux/dlist.h $(man_MANS)
+EXTRA_DIST = src/acm_mad.h src/acm_msg.h src/libacm.h \
+            linux/osd.h linux/dlist.h ibacm.spec.in $(man_MANS)
 
+dist-hook: ibacm.spec
+       cp ibacm.spec $(distdir)

diff --git a/configure.in b/configure.in
index 9311602f98f3dea41d9ec43ce0e7a0dd0bb1f906..da59fddeaa268d3f06a8a0d237980203aaf490f5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.\r
 \r
 AC_PREREQ(2.57)\r
-AC_INIT(ib_acm, 1.0.0, linux-rdma@vger.kernel.org)\r
+AC_INIT(ibacm, 1.0.0, linux-rdma@vger.kernel.org)\r
 AC_CONFIG_SRCDIR([src/acm.c])\r
 AC_CONFIG_AUX_DIR(config)\r
 AM_CONFIG_HEADER(config.h)\r
-AM_INIT_AUTOMAKE(ib_acm, 1.0.0)\r
+AM_INIT_AUTOMAKE(ibacm, 1.0.0)\r
 \r
 AM_PROG_LIBTOOL\r
 \r
@@ -25,9 +25,9 @@ AC_CHECK_SIZEOF(long)
 dnl Checks for libraries\r
 if test "$disable_libcheck" != "yes"; then\r
 AC_CHECK_LIB(ibverbs, ibv_get_device_list, [],\r
-    AC_MSG_ERROR([ibv_get_device_list() not found.  ib_acm requires libibverbs.]))\r
+    AC_MSG_ERROR([ibv_get_device_list() not found.  ibacm requires libibverbs.]))\r
 AC_CHECK_LIB(ibumad, umad_send, [],\r
-    AC_MSG_ERROR([umad_send() not found.  ib_acm requires libibumad.]))\r
+    AC_MSG_ERROR([umad_send() not found.  ibacm requires libibumad.]))\r
 fi\r
 \r
 dnl Checks for header files.\r

diff --git a/ibacm.spec.in b/ibacm.spec.in
index 2c10e1c25db4e195abfdd384300f2aeba5e5db71..85bd6d632f59c0ec7f68b48e15155fcadbf4a089 100644 (file)
--- a/ibacm.spec.in
+++ b/ibacm.spec.in
@@ -1,6 +1,6 @@
 %define ver @VERSION@
 
-Name: ib_acm
+Name: ibacm
 Version: 1.0.0
 Release: 1%{?dist}
 Summary: InfiniBand Communication Manager Assistant
@@ -14,7 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libibverbs-devel >= 1.1-1
 
 %description
-ib_acm assists with establishing communication over Infiniband.
+ibacm assists with establishing communication over Infiniband.
 
 %package svc
 Summary: IB CM pre-connection service application