From 71ec54603d723a51f1940d1cfe3063381de86314 Mon Sep 17 00:00:00 2001
From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Mon, 3 Jan 2011 11:15:50 +1100
Subject: [PATCH] Solaris install fixes, solaris needs to use ginstall, not
 install and it does not have ldconfig

---
 Makefile.in  |  4 ++--
 configure.ac | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 508003f..59fba85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,7 +6,7 @@ LIBS=-lpopt @LIBS@
 CC=gcc
 CFLAGS=-g -O2 -fPIC -Wall -W -I. -I./include "-D_U_=__attribute__((unused))"
 LIBISCSI_OBJ = lib/connect.o lib/crc32c.o lib/discovery.o lib/init.o lib/login.o lib/md5.o lib/nop.o lib/pdu.o lib/scsi-command.o lib/scsi-lowlevel.o lib/socket.o lib/sync.o
-INSTALLCMD = /usr/bin/install -c
+INSTALLCMD = @install@ -c
 
 LIBISCSI_SO_NAME=libiscsi.so.1
 VERSION=1.0.0
@@ -41,7 +41,7 @@ install: lib/libiscsi.a lib/$(LIBISCSI_SO) bin/iscsi-ls bin/iscsi-inq
 ifeq ("$(LIBDIR)x","x")
 	$(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(libdir)
 	$(INSTALLCMD) -m 755 lib/libiscsi.a $(libdir)
-	ldconfig
+	@ldconfig@
 else
 	$(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(LIBDIR)
 	$(INSTALLCMD) -m 755 lib/libiscsi.a $(LIBDIR)
diff --git a/configure.ac b/configure.ac
index 73460c5..6c7ae45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,10 @@ if test "${libdir}" = '${exec_prefix}/lib'; then
   esac
 fi
 
+is_solaris="no"
+install="/usr/bin/install"
+ldconfig="ldconfig"
+
 case `uname` in
   Linux*)
     AC_DEFINE(HAVE_GETHOSTBYNAME2,1,[Whether we have gethostbyname2 or not])
@@ -20,6 +24,9 @@ case `uname` in
   AIX*)
     ;;
   SunOS)
+    is_solaris="yes"
+    install="ginstall"
+    ldconfig="echo no ldconfig on solaris"
     LIBS="$LIBS -lsocket -lnsl"
     ;;
   *)
@@ -91,8 +98,9 @@ else
   exit
 fi
 
-
 AC_SUBST(libdir)
+AC_SUBST(install)
+AC_SUBST(ldconfig)
 #AC_SUBST(LIBISCSI_LDFLAGS)
 
 AC_OUTPUT(Makefile)