Added DESTDIR to various recipes

pull/95/head
Jeffrey Walton 2015-12-27 13:13:16 -05:00
parent 010c67914a
commit 1ab5cbd047
1 changed files with 37 additions and 28 deletions

View File

@ -57,6 +57,7 @@ ifeq ($(IS_ANDROID),1)
endif endif
LDLIBS += $(AOSP_STL_LIB) LDLIBS += $(AOSP_STL_LIB)
HAS_SOLIB_VERSION := 1
endif endif
# ARM embedded cross-compile configuration. # ARM embedded cross-compile configuration.
@ -65,6 +66,7 @@ endif
ifeq ($(IS_ARM_EMBEDDED),1) ifeq ($(IS_ARM_EMBEDDED),1)
# CPP, CXX, AR, RANLIB, LD, etc are set in 'setenv-embedded.sh' # CPP, CXX, AR, RANLIB, LD, etc are set in 'setenv-embedded.sh'
CXXFLAGS += $(ARM_EMBEDDED_FLAGS) --sysroot=$(ARM_EMBEDDED_SYSROOT) CXXFLAGS += $(ARM_EMBEDDED_FLAGS) --sysroot=$(ARM_EMBEDDED_SYSROOT)
HAS_SOLIB_VERSION := 1
endif endif
# List cryptlib.cpp first and cpu.cpp second in an attempt to tame C++ static initialization problems. # List cryptlib.cpp first and cpu.cpp second in an attempt to tame C++ static initialization problems.
@ -126,42 +128,49 @@ distclean: clean
.PHONY: install .PHONY: install
install: install:
$(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp
-$(CP) *.h $(PREFIX)/include/cryptopp -$(CP) *.h $(DESTDIR)$(PREFIX)/include/cryptopp
-$(CHMOD) 755 $(PREFIX)/include/cryptopp -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/include/cryptopp
-$(CHMOD) 644 $(PREFIX)/include/cryptopp/*.h -$(CHMOD) 644 $(DESTDIR)$(PREFIX)/include/cryptopp/*.h
-$(CP) libcryptopp.a $(PREFIX)/lib -$(CP) libcryptopp.a $(DESTDIR)$(PREFIX)/lib
-$(CHMOD) 644 $(PREFIX)/lib/libcryptopp.a -$(CHMOD) 644 $(DESTDIR)$(PREFIX)/lib/libcryptopp.a
ifeq ($(wildcard cryptest.exe),cryptest.exe) ifneq ($(wildcard cryptest.exe),)
$(MKDIR) -p $(PREFIX)/bin $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
-$(CP) cryptest.exe $(PREFIX)/bin -$(CP) cryptest.exe $(DESTDIR)$(PREFIX)/bin
-$(CHMOD) 755 $(PREFIX)/bin/cryptest.exe -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/cryptest.exe
endif endif
ifneq ($(IS_IOS),0) ifneq ($(wildcard libcryptopp.a),)
-$(CP) libcryptopp.dylib $(PREFIX)/lib $(MKDIR) -p $(DESTDIR)$(PREFIX)/lib
-$(CHMOD) 755 $(PREFIX)/lib/libcryptopp.dylib -$(CP) libcryptopp.a $(DESTDIR)$(PREFIX)/lib
else -$(CHMOD) 644 $(DESTDIR)$(PREFIX)/lib/libcryptopp.a
-$(CP) libcryptopp.so $(PREFIX)/lib endif
-$(CHMOD) 755 $(PREFIX)/lib/libcryptopp.so$(SOLIB_VERSION_SUFFIX) ifneq ($(wildcard libcryptopp.dylib),)
$(MKDIR) -p $(DESTDIR)$(PREFIX)/lib
-$(CP) libcryptopp.dylib $(DESTDIR)$(PREFIX)/lib
-$(CHMOD) 755 $(DESTDIR)$(PREFIX)/lib/libcryptopp.dylib
endif
ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),)
-$(CP) libcryptopp.so $(DESTDIR)$(PREFIX)/lib
-$(CHMOD) 755 $(DESTDIR)$(PREFIX)/lib/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
ifeq ($(HAS_SOLIB_VERSION),1) ifeq ($(HAS_SOLIB_VERSION),1)
-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(PREFIX)/lib/libcryptopp.so -$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so
$(LDCONF) $(PREFIX)/lib $(LDCONF) $(DESTDIR)$(PREFIX)/lib
endif endif
endif endif
.PHONY: remove uninstall .PHONY: remove uninstall
remove uninstall: remove uninstall:
-$(RM) -r $(PREFIX)/include/cryptopp -$(RM) -r $(DESTDIR)$(PREFIX)/include/cryptopp
-$(RM) $(PREFIX)/lib/libcryptopp.a -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.a
-$(RM) $(PREFIX)/bin/cryptest.exe -$(RM) $(DESTDIR)$(PREFIX)/bin/cryptest.exe
ifneq ($(IS_IOS),0) ifneq ($(IS_IOS),0)
-$(RM) $(PREFIX)/lib/libcryptopp.dylib -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.dylib
else else
-$(RM) $(PREFIX)/lib/libcryptopp.so$(SOLIB_VERSION_SUFFIX) -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
ifeq ($(HAS_SOLIB_VERSION),1) ifeq ($(HAS_SOLIB_VERSION),1)
-$(RM) $(PREFIX)/lib/libcryptopp.so$(SOLIB_COMPAT_SUFFIX) -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so$(SOLIB_COMPAT_SUFFIX)
-$(RM) $(PREFIX)/lib/libcryptopp.so -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so
$(LDCONF) $(PREFIX)/lib $(LDCONF) $(DESTDIR)$(PREFIX)/lib
endif endif
endif endif
@ -170,9 +179,9 @@ libcryptopp.a: $(LIBOBJS)
$(RANLIB) $@ $(RANLIB) $@
.PHONY: libcryptopp.so .PHONY: libcryptopp.so
libcryptopp.so: libcryptopp$(SOLIB_VERSION_SUFFIX) libcryptopp.so: libcryptopp.so$(SOLIB_VERSION_SUFFIX)
libcryptopp.so: $(LIBOBJS) libcryptopp.so$(SOLIB_VERSION_SUFFIX): $(LIBOBJS)
$(CXX) -shared $(SOLIB_FLAGS) -o $@ $(CXXFLAGS) -Wl,--exclude-libs,ALL $(LIBOBJS) $(LDLIBS) $(CXX) -shared $(SOLIB_FLAGS) -o $@ $(CXXFLAGS) -Wl,--exclude-libs,ALL $(LIBOBJS) $(LDLIBS)
ifeq ($(HAS_SOLIB_VERSION),1) ifeq ($(HAS_SOLIB_VERSION),1)
-$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) libcryptopp.so -$(LN) libcryptopp.so$(SOLIB_VERSION_SUFFIX) libcryptopp.so