From a17b23d42c7fd16747170ba13d0e116bd66e7614 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sun, 3 Jan 2016 15:30:59 -0500
Subject: [PATCH] Cut-in support for CRYPTOPP_DATA_DIR during install

---
 GNUmakefile | 47 ++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 799d4a0b..1711fea3 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -421,29 +421,37 @@ endif
 .PHONY: install
 install:
 	$(MKDIR) -p $(DESTDIR)$(INCLUDEDIR)/cryptopp
-	-$(CP) *.h $(DESTDIR)$(INCLUDEDIR)/cryptopp
-	-$(CHMOD) 755 $(DESTDIR)$(INCLUDEDIR)/cryptopp
-	-$(CHMOD) 644 $(DESTDIR)$(INCLUDEDIR)/cryptopp/*.h
+	$(CP) *.h $(DESTDIR)$(INCLUDEDIR)/cryptopp
+	-$(CHMOD) 0755 $(DESTDIR)$(INCLUDEDIR)/cryptopp
+	-$(CHMOD) 0644 $(DESTDIR)$(INCLUDEDIR)/cryptopp/*.h
 ifneq ($(wildcard libcryptopp.a),)
 	$(MKDIR) -p $(DESTDIR)$(LIBDIR)
-	-$(CP) libcryptopp.a $(DESTDIR)$(LIBDIR)
-	-$(CHMOD) 644 $(DESTDIR)$(LIBDIR)/libcryptopp.a
+	$(CP) libcryptopp.a $(DESTDIR)$(LIBDIR)
+	-$(CHMOD) 0644 $(DESTDIR)$(LIBDIR)/libcryptopp.a
 endif
 ifneq ($(wildcard cryptest.exe),)
 	$(MKDIR) -p $(DESTDIR)$(BINDIR)
-	-$(CP) cryptest.exe $(DESTDIR)$(BINDIR)
-	-$(CHMOD) 755 $(DESTDIR)$(BINDIR)/cryptest.exe
+	$(CP) cryptest.exe $(DESTDIR)$(BINDIR)
+	-$(CHMOD) 0755 $(DESTDIR)$(BINDIR)/cryptest.exe
+	$(MKDIR) -p $(DESTDIR)$(DATADIR)/cryptopp
+	$(CP) -r TestData $(DESTDIR)$(DATADIR)/cryptopp
+	$(CP) -r TestVectors $(DESTDIR)$(DATADIR)/cryptopp
+	-$(CHMOD) 0755 $(DESTDIR)$(DATADIR)/cryptopp
+	-$(CHMOD) 0755 $(DESTDIR)$(DATADIR)/cryptopp/TestData
+	-$(CHMOD) 0755 $(DESTDIR)$(DATADIR)/cryptopp/TestVectors
+	-$(CHMOD) 0644 $(DESTDIR)$(DATADIR)/cryptopp/TestData/*.dat
+	-$(CHMOD) 0644 $(DESTDIR)$(DATADIR)/cryptopp/TestVectors/*.txt
 endif
 ifneq ($(wildcard libcryptopp.dylib),)
 	$(MKDIR) -p $(DESTDIR)$(LIBDIR)
-	-$(CP) libcryptopp.dylib $(DESTDIR)$(LIBDIR)
+	$(CP) libcryptopp.dylib $(DESTDIR)$(LIBDIR)
 	-install_name_tool -id $(DESTDIR)$(LIBDIR)/libcryptopp.dylib $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
-	-$(CHMOD) 755 $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
+	-$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
 endif
 ifneq ($(wildcard libcryptopp.so$(SOLIB_VERSION_SUFFIX)),)
 	$(MKDIR) -p $(DESTDIR)$(LIBDIR)
-	-$(CP) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)
-	-$(CHMOD) 755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
+	$(CP) libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)
+	-$(CHMOD) 0755 $(DESTDIR)$(LIBDIR)/libcryptopp.so$(SOLIB_VERSION_SUFFIX)
 ifeq ($(HAS_SOLIB_VERSION),1)
 	-$(LN) -sf libcryptopp.so$(SOLIB_VERSION_SUFFIX) $(DESTDIR)$(LIBDIR)/libcryptopp.so
 	$(LDCONF) $(DESTDIR)$(LIBDIR)
@@ -455,6 +463,7 @@ remove uninstall:
 	-$(RM) -r $(DESTDIR)$(INCLUDEDIR)/cryptopp
 	-$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.a
 	-$(RM) $(DESTDIR)$(BINDIR)/cryptest.exe
+	-$(RM) -r $(DESTDIR)$(DATADIR)/cryptopp
 ifneq ($(IS_DARWIN),0)
 	-$(RM) $(DESTDIR)$(LIBDIR)/libcryptopp.dylib
 else
@@ -585,6 +594,22 @@ cpu.o:
 endif
 endif
 
+# Only use CRYPTOPP_DATA_DIR if its not set in CXXFLAGS
+ifeq ($(findstring -DCRYPTOPP_DATA_DIR,$(CXXFLAGS)),)
+ifneq ($(strip $(CRYPTOPP_DATA_DIR)),)
+validat%.o : validat%.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
+bench.o : bench.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
+bench%.o : bench%.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
+datatest.o : datatest.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
+test.o : test.cpp
+	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DATA_DIR=\"$(CRYPTOPP_DATA_DIR)\" -c $<
+endif
+endif
+
 %.dllonly.o : %.cpp
 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_DLL_ONLY -c $< -o $@