mirrors/unicorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/unicorn-engine/unicorn

Browse Source
This commit is contained in:
Nguyen Anh Quynh 2015-11-11 23:50:18 +08:00
commit 116d96692d
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -109,6 +109,7 @@ mem_double_unmap
mips_kseg0_1 mips_kseg0_1
eflags_nosync eflags_nosync
00opcode_uc_crash 00opcode_uc_crash
eflags_noset
################# #################

20
Makefile
View File

@ -161,8 +161,8 @@ LIBDIRARCH ?= lib
# Or better, pass 'LIBDIRARCH=lib64' to 'make install/uninstall' via 'make.sh'. # Or better, pass 'LIBDIRARCH=lib64' to 'make install/uninstall' via 'make.sh'.
#LIBDIRARCH ?= lib64 #LIBDIRARCH ?= lib64
LIBDIR ?= $(DESTDIR)$(PREFIX)/$(LIBDIRARCH) LIBDIR ?= $(PREFIX)/$(LIBDIRARCH)
INCDIR ?= $(DESTDIR)$(PREFIX)/include INCDIR ?= $(PREFIX)/include
LIBDATADIR ?= $(LIBDIR) LIBDATADIR ?= $(LIBDIR)
@ -261,21 +261,21 @@ test: all
install: all $(PKGCFGF) install: all $(PKGCFGF)
mkdir -p $(LIBDIR) mkdir -p $(DESTDIR)/$(LIBDIR)
ifeq ($(UNICORN_SHARED),yes) ifeq ($(UNICORN_SHARED),yes)
$(INSTALL_LIB) $(LIBRARY) $(LIBDIR) $(INSTALL_LIB) $(LIBRARY) $(DESTDIR)/$(LIBDIR)
ifneq ($(VERSION_EXT),) ifneq ($(VERSION_EXT),)
cd $(LIBDIR) && \ cd $(DESTDIR)/$(LIBDIR) && \
ln -sf lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME).$(EXT) ln -sf lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME).$(EXT)
endif endif
endif endif
ifeq ($(UNICORN_STATIC),yes) ifeq ($(UNICORN_STATIC),yes)
$(INSTALL_DATA) $(ARCHIVE) $(LIBDIR) $(INSTALL_DATA) $(ARCHIVE) $(DESTDIR)/$(LIBDIR)
endif endif
mkdir -p $(INCDIR)/$(LIBNAME) mkdir -p $(DESTDIR)/$(INCDIR)/$(LIBNAME)
$(INSTALL_DATA) include/unicorn/*.h $(INCDIR)/$(LIBNAME) $(INSTALL_DATA) include/unicorn/*.h $(DESTDIR)/$(INCDIR)/$(LIBNAME)
mkdir -p $(PKGCFGDIR) mkdir -p $(DESTDIR)/$(PKGCFGDIR)
$(INSTALL_DATA) $(PKGCFGF) $(PKGCFGDIR)/ $(INSTALL_DATA) $(PKGCFGF) $(DESTDIR)/$(PKGCFGDIR)/
TAG ?= HEAD TAG ?= HEAD