commit 91659c0d5507f79119be1319a1f139f35e23238f
author pancake <pancake@nopcode.org> Sun Nov 08 12:05:41 2015 +0100
committer pancake <pancake@nopcode.org> Sun Nov 08 12:05:41 2015 +0100
tree 2bd7e5d69922c49ed7685babe0d9f26b781e8f34
parent cc1e14431c44f80efea7453e5d1e8dee256972b2

Fix #184 - properly handle DESTDIR in pkgconfig file

Makefile

diff --git a/Makefile b/Makefile
index 034e254..8883b2a 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@
 BLDIR = $(abspath $(BUILDDIR))
 OBJDIR = $(BLDIR)/obj
 endif
-INCDIR ?= $(DESTDIR)$(PREFIX)/include
+INCDIR ?= $(PREFIX)/include
 
 UNAME_S := $(shell uname -s)
 
@@ -67,7 +67,7 @@
 # Uncomment the below line to installs x86_64 libs to lib64/ directory.
 # Or better, pass 'LIBDIRARCH=lib64' to 'make install/uninstall' via 'make.sh'.
 #LIBDIRARCH ?= lib64
-LIBDIR ?= $(DESTDIR)$(PREFIX)/$(LIBDIRARCH)
+LIBDIR ?= $(PREFIX)/$(LIBDIRARCH)
 
 LIBDATADIR ?= $(LIBDIR)
 
@@ -76,10 +76,10 @@
 
 ifndef USE_GENERIC_LIBDATADIR
 ifeq ($(UNAME_S), FreeBSD)
-LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata
+LIBDATADIR = $(PREFIX)/libdata
 endif
 ifeq ($(UNAME_S), DragonFly)
-LIBDATADIR = $(DESTDIR)$(PREFIX)/libdata
+LIBDATADIR = $(PREFIX)/libdata
 endif
 endif
 
@@ -401,27 +401,27 @@
 endif
 
 install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY)
-	mkdir -p $(LIBDIR)
+	mkdir -p $(DESTDIR)/$(LIBDIR)
 ifeq ($(CAPSTONE_SHARED),yes)
-	$(INSTALL_LIB) $(LIBRARY) $(LIBDIR)
+	$(INSTALL_LIB) $(LIBRARY) $(DESTDIR)/$(LIBDIR)
 ifneq ($(VERSION_EXT),)
-	cd $(LIBDIR) && \
+	cd $(DESTDIR)/$(LIBDIR) && \
 	mv lib$(LIBNAME).$(EXT) lib$(LIBNAME).$(VERSION_EXT) && \
 	ln -s lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME).$(EXT)
 endif
 endif
 ifeq ($(CAPSTONE_STATIC),yes)
-	$(INSTALL_DATA) $(ARCHIVE) $(LIBDIR)
+	$(INSTALL_DATA) $(ARCHIVE) $(DESTDIR)/$(LIBDIR)
 endif
-	mkdir -p $(INCDIR)/$(LIBNAME)
-	$(INSTALL_DATA) include/capstone/*.h $(INCDIR)/$(LIBNAME)
-	mkdir -p $(PKGCFGDIR)
-	$(INSTALL_DATA) $(PKGCFGF) $(PKGCFGDIR)/
+	mkdir -p $(DESTDIR)/$(INCDIR)/$(LIBNAME)
+	$(INSTALL_DATA) include/capstone/*.h $(DESTDIR)/$(INCDIR)/$(LIBNAME)
+	mkdir -p $(DESTDIR)/$(PKGCFGDIR)
+	$(INSTALL_DATA) $(PKGCFGF) $(DESTDIR)/$(PKGCFGDIR)
 
 uninstall:
-	rm -rf $(INCDIR)/$(LIBNAME)
-	rm -f $(LIBDIR)/lib$(LIBNAME).*
-	rm -f $(PKGCFGDIR)/$(LIBNAME).pc
+	rm -rf $(DESTDIR)/$(INCDIR)/$(LIBNAME)
+	rm -f $(DESTDIR)/$(LIBDIR)/lib$(LIBNAME).*
+	rm -f $(DESTDIR)/$(PKGCFGDIR)/$(LIBNAME).pc
 
 clean:
 	rm -f $(LIBOBJ)