Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix merge conflicts

This commit is contained in:
Nguyen Anh Quynh 2018-12-19 09:23:14 +07:00
parent 9ecc20f1bb d39cdf473d
commit 4d8d3573dc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -402,10 +402,10 @@ else
endif endif
install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY) install: $(PKGCFGF) $(ARCHIVE) $(LIBRARY)
mkdir -p $(DESTDIR)$(LIBDIR) mkdir -p $(LIBDIR)
$(call install-library,$(DESTDIR)$(LIBDIR)) $(call install-library,$(LIBDIR))
ifeq ($(CAPSTONE_STATIC),yes) ifeq ($(CAPSTONE_STATIC),yes)
$(INSTALL_DATA) $(ARCHIVE) $(DESTDIR)$(LIBDIR) $(INSTALL_DATA) $(ARCHIVE) $(LIBDIR)
endif endif
mkdir -p $(DESTDIR)$(INCDIR)/$(LIBNAME) mkdir -p $(DESTDIR)$(INCDIR)/$(LIBNAME)
$(INSTALL_DATA) include/capstone/*.h $(DESTDIR)$(INCDIR)/$(LIBNAME) $(INSTALL_DATA) include/capstone/*.h $(DESTDIR)$(INCDIR)/$(LIBNAME)