From 631954405a80acf33ce0318bda9aeb04804bced8 Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Sun, 5 Dec 2010 13:40:48 +1100
Subject: [PATCH] add prefix exec_prefix libdir and bindir to the makefile

---
 Makefile.in  | 8 ++++++--
 configure.ac | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index d11de3e..02bdc13 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,7 @@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+libdir = @libdir@
+bindir = @bindir@
 LIBS="-lpopt"
 CC=gcc
 CFLAGS=-g -O0 -fPIC -Wall -W -I./include "-D_U_=__attribute__((unused))"
@@ -35,8 +39,8 @@ bin/iscsiclient: examples/iscsiclient.c lib/libiscsi.a
 
 install: lib/libiscsi.a lib/$(LIBISCSI_SO) bin/iscsi-ls bin/iscsi-inq
 ifeq ("$(LIBDIR)x","x")
-	$(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) /usr/lib
-	$(INSTALLCMD) -m 755 lib/libiscsi.a /usr/lib
+	$(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(libdir)
+	$(INSTALLCMD) -m 755 lib/libiscsi.a $(libdir)
 	ldconfig
 else
 	$(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(LIBDIR)
diff --git a/configure.ac b/configure.ac
index c6cdd44..b928c3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ if test x"$libiscsi_cv_HAVE_SOCK_SIN_LEN" = x"yes"; then
     AC_DEFINE(HAVE_SOCK_SIN_LEN,1,[Whether the sockaddr_in struct has a sin_len property])
 fi
 
-AC_SUBST(EXTRA_OBJ)
+AC_SUBST(libdir)
 #AC_SUBST(LIBISCSI_LDFLAGS)
 
 AC_OUTPUT(Makefile)