[openib-general] [PATCH] use standard path names in automake for managment

[Tom Duffy]

Use standard paths for autotools.  You can always go back to using the
directory by specifying ./configure --exec-prefix=/usr/local/ib/ if you
want.

Signed-off-by: Tom Duffy <tduffy at sun.com>

Index: diags/net/ibtracert/Makefile.am
===================================================================
--- diags/net/ibtracert/Makefile.am	(revision 1757)
+++ diags/net/ibtracert/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
-
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../../libibumad/include/infiniband \
Index: diags/net/ibnetdiscover/Makefile.am
===================================================================
--- diags/net/ibnetdiscover/Makefile.am	(revision 1757)
+++ diags/net/ibnetdiscover/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
-
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../../libibumad/include/infiniband \
Index: diags/net/perfquery/Makefile.am
===================================================================
--- diags/net/perfquery/Makefile.am	(revision 1757)
+++ diags/net/perfquery/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
-
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../../libibumad/include/infiniband \
Index: diags/net/smpdump/Makefile.am
===================================================================
--- diags/net/smpdump/Makefile.am	(revision 1757)
+++ diags/net/smpdump/Makefile.am	(working copy)
@@ -1,6 +1,6 @@
 
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../../libibumad/include/infiniband
Index: diags/net/smpquery/Makefile.am
===================================================================
--- diags/net/smpquery/Makefile.am	(revision 1757)
+++ diags/net/smpquery/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
-
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../../libibumad/include/infiniband \
Index: diags/net/ibaddr/Makefile.am
===================================================================
--- diags/net/ibaddr/Makefile.am	(revision 1757)
+++ diags/net/ibaddr/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
-
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../../libibumad/include/infiniband \
Index: diags/net/ibroute/Makefile.am
===================================================================
--- diags/net/ibroute/Makefile.am	(revision 1757)
+++ diags/net/ibroute/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
-
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../../libibumad/include/infiniband \
Index: diags/net/sminfo/Makefile.am
===================================================================
--- diags/net/sminfo/Makefile.am	(revision 1757)
+++ diags/net/sminfo/Makefile.am	(working copy)
@@ -1,6 +1,6 @@
 
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../../libibumad/include/infiniband \
Index: diags/host/ibstat/Makefile.am
===================================================================
--- diags/host/ibstat/Makefile.am	(revision 1757)
+++ diags/host/ibstat/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
-
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../../libibumad/include/infiniband
Index: diags/host/scripts/Makefile.am
===================================================================
--- diags/host/scripts/Makefile.am	(revision 1757)
+++ diags/host/scripts/Makefile.am	(working copy)
@@ -1,5 +1,4 @@
-
-bindir = ${exec_prefix}/ib/bin
+bindir = @bindir@
 
 bin_SCRIPTS = ibstatus
 
Index: libibumad/Makefile.am
===================================================================
--- libibumad/Makefile.am	(revision 1757)
+++ libibumad/Makefile.am	(working copy)
@@ -1,5 +1,4 @@
-
-libdir = ${exec_prefix}/ib/lib
+libdir = @libdir@
 
 SUBDIRS = .
 
Index: libibcommon/Makefile.am
===================================================================
--- libibcommon/Makefile.am	(revision 1757)
+++ libibcommon/Makefile.am	(working copy)
@@ -1,5 +1,4 @@
-
-libdir = ${exec_prefix}/ib/lib
+libdir = @libdir@
 
 SUBDIRS = .
 
Index: osm/opensm/Makefile.am
===================================================================
--- osm/opensm/Makefile.am	(revision 1757)
+++ osm/opensm/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
-
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../include \
 	   -I$(srcdir)/../../libibcommon/include/infiniband \
Index: osm/libvendor/Makefile.am
===================================================================
--- osm/libvendor/Makefile.am	(revision 1757)
+++ osm/libvendor/Makefile.am	(working copy)
@@ -1,5 +1,4 @@
-
-libdir = ${exec_prefix}/ib/lib
+libdir = @libdir@
 
 SUBDIRS = .
 
Index: osm/complib/Makefile.am
===================================================================
--- osm/complib/Makefile.am	(revision 1757)
+++ osm/complib/Makefile.am	(working copy)
@@ -1,5 +1,4 @@
-
-libdir = ${exec_prefix}/ib/lib
+libdir = @libdir@
 
 SUBDIRS = .
 
Index: libibmad/Makefile.am
===================================================================
--- libibmad/Makefile.am	(revision 1757)
+++ libibmad/Makefile.am	(working copy)
@@ -1,5 +1,4 @@
-
-libdir = ${exec_prefix}/ib/lib
+libdir = @libdir@
 
 SUBDIRS = .
 
Index: util/mad_test/Makefile.am
===================================================================
--- util/mad_test/Makefile.am	(revision 1757)
+++ util/mad_test/Makefile.am	(working copy)
@@ -1,6 +1,5 @@
-
-bindir = ${exec_prefix}/ib/bin
-libdir = ${exec_prefix}/ib/lib
+bindir = @bindir@
+libdir = @libdir@
 
 INCLUDES = -I$(srcdir)/../../libibcommon/include/infiniband \
 	   -I$(srcdir)/../../libibumad/include/infiniband