From: Jens Steube <jens.steube@gmail.com>
Date: Mon, 4 Jul 2016 07:15:24 +0000 (+0200)
Subject: Merge pull request #407 from joshdekock/patch-1
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=73f05240bd78bfd95997eadf50e775d6834b258e;hp=b58f7a4675fb81bdef00d14b44a3dc77f308165a;p=hashcat.git

Merge pull request #407 from joshdekock/patch-1

Fix makefile on OSX
---

diff --git a/src/Makefile b/src/Makefile
index 6b0a413..9f11325 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -63,6 +63,9 @@ FIND                     := find
 INSTALL                  := install
 RM                       := rm
 SED                      := sed
+ifeq ($(UNAME),Darwin)
+SED                      := gsed
+endif
 
 ##
 ## Cross compiler paths
@@ -81,7 +84,7 @@ CC_WIN_64                := x86_64-w64-mingw32-gcc
 COMPTIME                 := $(shell date +%s)
 
 VERSION_EXPORT           := $Format:%D$
-VERSION_TAG              := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)"|cut -d, -f2|sed -r 's|.* (\w+/)?([^ ]+)|\2|')
+VERSION_TAG              := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)"|cut -d, -f2|$(SED) -r 's|.* (\w+/)?([^ ]+)|\2|')
 
 ##
 ## Compiler flags
@@ -106,7 +109,6 @@ BINARY_NATIVE            := $(PROG_NAME)
 
 ifeq ($(UNAME),Darwin)
 export MACOSX_DEPLOYMENT_TARGET=10.9
-BINARY_NATIVE            := $(BINARY_NATIVE).app
 CFLAGS_NATIVE            := -D_POSIX -DDARWIN
 CFLAGS_NATIVE            += $(CFLAGS)
 LFLAGS_NATIVE            := -lpthread
@@ -178,7 +180,7 @@ native: hashcat
 binaries: linux32 linux64 win32 win64
 
 clean:
-	$(RM) -f obj/*.o *.bin *.exe *.app *.restore *.out *.pot *.dictstat *.log hashcat core
+	$(RM) -f obj/*.o *.bin *.exe *.restore *.out *.pot *.dictstat *.log hashcat core
 	$(RM) -rf *.induct
 	$(RM) -rf *.outfiles
 	$(RM) -rf *.dSYM