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

Let DESTDIR and LIBDIR override prefix and libdir

Browse Source 
The following used to fail:

  ./configure --prefix=/tmp/libiscsi
  make install

This was because DESTDIR was unconditionally used in Makefile.in.
Instead, use the prefix from ./configure unless overriden by DESTDIR
and/or LIBDIR.

Note that this commit drops ldconfig from the Makefile but I'm not sure
this is wanted outside of packaging anyway.

Signed-off-by: Stefan Hajnoczi <stefanha@gmail.com>
This commit is contained in:
Stefan Hajnoczi
2011-02-19 15:55:34 +00:00
parent b1955c69ff
commit 7ed8707633
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.in
+13 -13
View File
@@ -1,6 +1,12 @@
prefix = @prefix@ prefix = $(DESTDIR)
ifeq ($(prefix),)
prefix = @prefix@
endif
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
libdir = @libdir@ libdir = $(LIBDIR)
ifeq ($(libdir),)
libdir = @libdir@
endif
bindir = @bindir@ bindir = @bindir@
LIBS=-lpopt @LIBS@ LIBS=-lpopt @LIBS@
CC=gcc CC=gcc
@@ -43,19 +49,13 @@ bin/iscsiclient: examples/iscsiclient.c lib/libiscsi.a
$(CC) $(CFLAGS) -o $@ examples/iscsiclient.c lib/libiscsi.a $(LIBS) $(CC) $(CFLAGS) -o $@ examples/iscsiclient.c lib/libiscsi.a $(LIBS)
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")
$(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(libdir) $(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(libdir)
$(INSTALLCMD) -m 755 lib/libiscsi.a $(libdir) $(INSTALLCMD) -m 755 lib/libiscsi.a $(libdir)
@ldconfig@ $(INSTALLCMD) -m 755 bin/iscsi-ls $(bindir)
else $(INSTALLCMD) -m 755 bin/iscsi-inq $(bindir)
$(INSTALLCMD) -m 755 lib/$(LIBISCSI_SO) $(LIBDIR) mkdir -p $(exec_prefix)/include/iscsi
$(INSTALLCMD) -m 755 lib/libiscsi.a $(LIBDIR) $(INSTALLCMD) -m 644 include/iscsi.h $(exec_prefix)/include/iscsi
endif $(INSTALLCMD) -m 644 include/scsi-lowlevel.h $(exec_prefix)/include/iscsi
$(INSTALLCMD) -m 755 bin/iscsi-ls $(DESTDIR)/usr/bin
$(INSTALLCMD) -m 755 bin/iscsi-inq $(DESTDIR)/usr/bin
mkdir -p $(DESTDIR)/usr/include/iscsi
$(INSTALLCMD) -m 644 include/iscsi.h $(DESTDIR)/usr/include/iscsi
$(INSTALLCMD) -m 644 include/scsi-lowlevel.h $(DESTDIR)/usr/include/iscsi
distclean: clean distclean: clean
rm -f config.h config.log config.status configure Makefile rm -f config.h config.log config.status configure Makefile