Add support for installing to a libdir other than 'lib'. Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
diff --git a/Makefile b/Makefile
index e032d86..c8f5cfa 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ DOXYGEN = doxygen
RANLIB = ranlib
prefix=/usr/local
+libdir=$(prefix)/lib
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo no')
@@ -65,14 +66,14 @@ install: $(GIT_LIB) $(PUBLIC_HEADERS) libgit2.pc
@for i in $(PUBLIC_HEADERS); do \
cat .HEADER $$i > $(DESTDIR)/$(prefix)/include/$${i##src/}; \
done
- @mkdir -p $(DESTDIR)/$(prefix)/lib
- @cp -f $(GIT_LIB) $(DESTDIR)/$(prefix)/lib/libgit2.a
- @mkdir -p $(DESTDIR)/$(prefix)/lib/pkgconfig
- @cp -f libgit2.pc $(DESTDIR)/$(prefix)/lib/pkgconfig/libgit2.pc
+ @mkdir -p $(DESTDIR)/$(libdir)
+ @cp -f $(GIT_LIB) $(DESTDIR)/$(libdir)/libgit2.a
+ @mkdir -p $(DESTDIR)/$(libdir)/pkgconfig
+ @cp -f libgit2.pc $(DESTDIR)/$(libdir)/pkgconfig/libgit2.pc
uninstall:
- @rm -f $(DESTDIR)/$(prefix)/lib/libgit2.a
- @rm -f $(DESTDIR)/$(prefix)/lib/pkgconfig/libgit2.pc
+ @rm -f $(DESTDIR)/$(libdir)/libgit2.a
+ @rm -f $(DESTDIR)/$(libdir)/pkgconfig/libgit2.pc
@for i in $(PUBLIC_HEADERS); do \
rm -f $(DESTDIR)/$(prefix)/include/$${i##src/}; \
done
@@ -124,7 +125,7 @@ $(TEST_RUN): tests/%.run: tests/%.exe
fi
libgit2.pc: libgit2.pc.in
- sed 's#@prefix@#$(prefix)#' $< > $@
+ sed -e 's#@prefix@#$(prefix)#' -e 's#@libdir@#$(libdir)#' $< > $@
.PHONY: all
.PHONY: clean
diff --git a/libgit2.pc.in b/libgit2.pc.in
index 89528ef..83fc82f 100644
--- a/libgit2.pc.in
+++ b/libgit2.pc.in
@@ -1,6 +1,6 @@
prefix=@prefix@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=@libdir@
includedir=${prefix}/include
Name: libgit2