commit 4d8d3573dc129965356fc3dd4ed4770451ad505f
author Nguyen Anh Quynh <aquynh@gmail.com> Wed Dec 19 09:23:14 2018 +0700
committer Nguyen Anh Quynh <aquynh@gmail.com> Wed Dec 19 09:23:14 2018 +0700
tree 10bdf04a1d802762d77188ee49d64ed07472802f
parent 9ecc20f1bbf2b212a4b523da51787dd6c80a357d
parent d39cdf473d5d9124a46f75a0a037d4a01a155da5

fix merge conflicts

Makefile

diff --git a/Makefile b/Makefile
index 1d3c9f2..ba12a7c 100644
--- a/Makefile
+++ b/Makefile
@@ -402,10 +402,10 @@
 endif
 
 install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY)
-	mkdir -p $(DESTDIR)$(LIBDIR)
-	$(call install-library,$(DESTDIR)$(LIBDIR))
+	mkdir -p $(LIBDIR)
+	$(call install-library,$(LIBDIR))
 ifeq ($(CAPSTONE_STATIC),yes)
-	$(INSTALL_DATA) $(ARCHIVE) $(DESTDIR)$(LIBDIR)
+	$(INSTALL_DATA) $(ARCHIVE) $(LIBDIR)
 endif
 	mkdir -p $(DESTDIR)$(INCDIR)/$(LIBNAME)
 	$(INSTALL_DATA) include/capstone/*.h $(DESTDIR)$(INCDIR)/$(LIBNAME)