From b7fb9e5ee4123ea7903999f0ed8b6f2915679497 Mon Sep 17 00:00:00 2001 From: Alexander Afanasyev Date: Fri, 11 Dec 2015 20:23:40 -0800 Subject: [PATCH 1/2] build: Change default installation prefix to /usr/local --- GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GNUmakefile b/GNUmakefile index 92adbb02..25cfc873 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -39,7 +39,7 @@ MACPORTS_COMPILER := $(shell $(CXX) --version 2>&1 | $(EGREP) -i -c "macports") # Default prefix for make install ifeq ($(PREFIX),) -PREFIX = /usr +PREFIX = /usr/local endif ifeq ($(CXX),gcc) # for some reason CXX is gcc on cygwin 1.1.4 From 92dd807c83ee6efe2485cb5ce9ed7e61ae8774a7 Mon Sep 17 00:00:00 2001 From: Alexander Afanasyev Date: Fri, 11 Dec 2015 20:28:16 -0800 Subject: [PATCH 2/2] build: Support DESTDIR variable to adjust installation path --- GNUmakefile | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 25cfc873..cf647bb8 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -354,31 +354,31 @@ endif .PHONY: install install: - $(MKDIR) -p $(PREFIX)/include/cryptopp $(PREFIX)/lib $(PREFIX)/bin - -$(CP) *.h $(PREFIX)/include/cryptopp - -$(CHMOD) 755 $(PREFIX)/include/cryptopp - -$(CHMOD) 644 $(PREFIX)/include/cryptopp/*.h - -$(CP) libcryptopp.a $(PREFIX)/lib - -$(CHMOD) 644 $(PREFIX)/lib/libcryptopp.a - -$(CP) cryptest.exe $(PREFIX)/bin - -$(CHMOD) 755 $(PREFIX)/bin/cryptest.exe + $(MKDIR) -p $(DESTDIR)$(PREFIX)/include/cryptopp $(DESTDIR)$(PREFIX)/lib $(DESTDIR)$(PREFIX)/bin + -$(CP) *.h $(DESTDIR)$(PREFIX)/include/cryptopp + -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/include/cryptopp + -$(CHMOD) 644 $(DESTDIR)$(PREFIX)/include/cryptopp/*.h + -$(CP) libcryptopp.a $(DESTDIR)$(PREFIX)/lib + -$(CHMOD) 644 $(DESTDIR)$(PREFIX)/lib/libcryptopp.a + -$(CP) cryptest.exe $(DESTDIR)$(PREFIX)/bin + -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/bin/cryptest.exe ifneq ($(IS_DARWIN),0) - -$(CP) libcryptopp.dylib $(PREFIX)/lib - -$(CHMOD) 755 $(PREFIX)/lib/libcryptopp.dylib + -$(CP) libcryptopp.dylib $(DESTDIR)$(PREFIX)/lib + -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/lib/libcryptopp.dylib else - -$(CP) libcryptopp.so $(PREFIX)/lib - -$(CHMOD) 755 $(PREFIX)/lib/libcryptopp.so + -$(CP) libcryptopp.so $(DESTDIR)$(PREFIX)/lib + -$(CHMOD) 755 $(DESTDIR)$(PREFIX)/lib/libcryptopp.so endif .PHONY: remove uninstall remove uninstall: - -$(RM) -r $(PREFIX)/include/cryptopp - -$(RM) $(PREFIX)/lib/libcryptopp.a - -$(RM) $(PREFIX)/bin/cryptest.exe + -$(RM) -r $(DESTDIR)$(PREFIX)/include/cryptopp + -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.a + -$(RM) $(DESTDIR)$(PREFIX)/bin/cryptest.exe ifneq ($(IS_DARWIN),0) - -$(RM) $(PREFIX)/lib/libcryptopp.dylib + -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.dylib else - -$(RM) $(PREFIX)/lib/libcryptopp.so + -$(RM) $(DESTDIR)$(PREFIX)/lib/libcryptopp.so endif libcryptopp.a: public_service | $(LIBOBJS)