admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

add prefix exec_prefix libdir and bindir to the makefile

Browse Source
This commit is contained in:
Ronnie Sahlberg
2010-12-05 13:40:48 +11:00
parent d7a1103e13
commit 631954405a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@@ -1,3 +1,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
bindir = @bindir@
LIBS="-lpopt" LIBS="-lpopt"
CC=gcc CC=gcc
CFLAGS=-g -O0 -fPIC -Wall -W -I./include "-D_U_=__attribute__((unused))" 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 install: lib/libiscsi.a lib/$(LIBISCSI_SO) bin/iscsi-ls bin/iscsi-inq
ifeq ("$(LIBDIR)x","x") ifeq ("$(LIBDIR)x","x")
$(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) /usr/lib $(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(libdir)
$(INSTALLCMD) -m 755 lib/libiscsi.a /usr/lib $(INSTALLCMD) -m 755 lib/libiscsi.a $(libdir)
ldconfig ldconfig
else else
$(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(LIBDIR) $(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(LIBDIR)

2
configure.ac
View File

@@ -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]) AC_DEFINE(HAVE_SOCK_SIN_LEN,1,[Whether the sockaddr_in struct has a sin_len property])
fi fi
AC_SUBST(EXTRA_OBJ) AC_SUBST(libdir)
#AC_SUBST(LIBISCSI_LDFLAGS) #AC_SUBST(LIBISCSI_LDFLAGS)
AC_OUTPUT(Makefile) AC_OUTPUT(Makefile)