From: Jens Steube <jens.steube@gmail.com>
Date: Fri, 10 Jun 2016 21:54:46 +0000 (+0200)
Subject: Merge pull request #369 from hlein/DESTDIR
X-Git-Tag: v3.00~71
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=f30629b21a5350b205972e3e7a5dd62f683e15ad;hp=10b086a31d674d17da47304bcb542ec6b7202170;p=hashcat.git

Merge pull request #369 from hlein/DESTDIR

Added DESTDIR support
---

diff --git a/src/Makefile b/src/Makefile
index b25f769..0b1ba80 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -37,6 +37,7 @@ endif
 ## Installation paths (Linux only)
 ##
 
+DESTDIR                  ?=
 PREFIX                   ?= /usr/local
 
 INSTALL_FOLDER           ?= $(PREFIX)/bin
@@ -194,30 +195,31 @@ win64: hashcat64.exe
 ##
 
 install: native
-	$(INSTALL) -m 755 -d                            $(DOCUMENT_FOLDER)
-	$(CP) -a docs/*                                 $(DOCUMENT_FOLDER)/
-	$(CP) -a example*.sh                            $(DOCUMENT_FOLDER)/
-	$(CP) -a example*.hash                          $(DOCUMENT_FOLDER)/
-	$(INSTALL) -m 644 example.dict                  $(DOCUMENT_FOLDER)/
-	$(INSTALL) -m 755 -d                            $(DOCUMENT_FOLDER)/extra
-	$(CP) -a extra/*                                $(DOCUMENT_FOLDER)/extra/
-	$(INSTALL) -m 755 -d                            $(SHARED_FOLDER)
-	$(INSTALL) -m 755 -d                            $(SHARED_FOLDER)/charsets
-	$(CP) -a charsets/*                             $(SHARED_FOLDER)/charsets/
-	$(INSTALL) -m 755 -d                            $(SHARED_FOLDER)/masks
-	$(CP) -a masks/*                                $(SHARED_FOLDER)/masks/
-	$(INSTALL) -m 755 -d                            $(SHARED_FOLDER)/OpenCL
-	$(CP) -a OpenCL/*                               $(SHARED_FOLDER)/OpenCL/
-	$(INSTALL) -m 755 -d                            $(SHARED_FOLDER)/rules
-	$(CP) -a rules/*                                $(SHARED_FOLDER)/rules/
-	$(INSTALL) -m 644 hashcat.hcstat                $(SHARED_FOLDER)/
-	$(INSTALL) -m 644 hashcat.hctune                $(SHARED_FOLDER)/
-	$(INSTALL) -m 755 $(BINARY_NATIVE)              $(INSTALL_FOLDER)/
+	$(INSTALL) -m 755 -d                            $(DESTDIR)$(DOCUMENT_FOLDER)
+	$(CP) -a docs/*                                 $(DESTDIR)$(DOCUMENT_FOLDER)/
+	$(CP) -a example*.sh                            $(DESTDIR)$(DOCUMENT_FOLDER)/
+	$(CP) -a example*.hash                          $(DESTDIR)$(DOCUMENT_FOLDER)/
+	$(INSTALL) -m 644 example.dict                  $(DESTDIR)$(DOCUMENT_FOLDER)/
+	$(INSTALL) -m 755 -d                            $(DESTDIR)$(DOCUMENT_FOLDER)/extra
+	$(CP) -a extra/*                                $(DESTDIR)$(DOCUMENT_FOLDER)/extra/
+	$(INSTALL) -m 755 -d                            $(DESTDIR)$(SHARED_FOLDER)
+	$(INSTALL) -m 755 -d                            $(DESTDIR)$(SHARED_FOLDER)/charsets
+	$(CP) -a charsets/*                             $(DESTDIR)$(SHARED_FOLDER)/charsets/
+	$(INSTALL) -m 755 -d                            $(DESTDIR)$(SHARED_FOLDER)/masks
+	$(CP) -a masks/*                                $(DESTDIR)$(SHARED_FOLDER)/masks/
+	$(INSTALL) -m 755 -d                            $(DESTDIR)$(SHARED_FOLDER)/OpenCL
+	$(CP) -a OpenCL/*                               $(DESTDIR)$(SHARED_FOLDER)/OpenCL/
+	$(INSTALL) -m 755 -d                            $(DESTDIR)$(SHARED_FOLDER)/rules
+	$(CP) -a rules/*                                $(DESTDIR)$(SHARED_FOLDER)/rules/
+	$(INSTALL) -m 644 hashcat.hcstat                $(DESTDIR)$(SHARED_FOLDER)/
+	$(INSTALL) -m 644 hashcat.hctune                $(DESTDIR)$(SHARED_FOLDER)/
+	$(INSTALL) -m 755 -d                            $(DESTDIR)$(INSTALL_FOLDER)
+	$(INSTALL) -m 755 $(BINARY_NATIVE)              $(DESTDIR)$(INSTALL_FOLDER)/
 
 uninstall:
-	$(RM) -f  $(INSTALL_FOLDER)/$(BINARY_NATIVE)
-	$(RM) -rf $(SHARED_FOLDER)
-	$(RM) -rf $(DOCUMENT_FOLDER)
+	$(RM) -f  $(DESTDIR)$(INSTALL_FOLDER)/$(BINARY_NATIVE)
+	$(RM) -rf $(DESTDIR)$(SHARED_FOLDER)
+	$(RM) -rf $(DESTDIR)$(DOCUMENT_FOLDER)
 
 ##
 ## native compiled hashcat