arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-11 00:01:16 +00:00
Code Issues Releases Wiki Activity

for 1414: add dependency on the shared root folder, fix parallel builds

Browse Source
This commit is contained in:
philsmd 2017-11-06 12:46:56 +01:00
parent f8c687f529
commit 7825846e00
No known key found for this signature in database
GPG Key ID: 4F25D016D9D6A8AF
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@ -8,6 +8,7 @@
- Fixed compile of kernels on AMD systems on windows due to invalid detection of ROCm - Fixed compile of kernels on AMD systems on windows due to invalid detection of ROCm
- Fixed compile of sources using clang under MSYS2 - Fixed compile of sources using clang under MSYS2
- Fixed overlapping memory segment copy in CPU rule engine if using a specific rule function - Fixed overlapping memory segment copy in CPU rule engine if using a specific rule function
- Fixed a parallel build problem when using the "install" Makefile target
* changes v3.6.0 -> v4.0.0: * changes v3.6.0 -> v4.0.0:

15
src/Makefile
View File

@ -48,8 +48,9 @@ PREFIX ?= /usr/local
INSTALL_FOLDER ?= $(PREFIX)/bin INSTALL_FOLDER ?= $(PREFIX)/bin
LIBRARY_FOLDER ?= $(PREFIX)/lib LIBRARY_FOLDER ?= $(PREFIX)/lib
SHARED_FOLDER ?= $(PREFIX)/share/hashcat SHARED_ROOT_FOLDER ?= $(PREFIX)/share
DOCUMENT_FOLDER ?= $(PREFIX)/share/doc/hashcat SHARED_FOLDER ?= $(SHARED_ROOT_FOLDER)/hashcat
DOCUMENT_FOLDER ?= $(SHARED_ROOT_FOLDER)/doc/hashcat
## ##
## Filenames for library and frontend ## Filenames for library and frontend
@ -330,7 +331,13 @@ else
install: install_docs install_shared install_hashcat install: install_docs install_shared install_hashcat
endif endif
install_docs: # we need this extra target to make sure that for parallel builds (i.e. 2+ Makefile targets could possible run at the same time)
# the root folder of the shared directory is created first (and is a dependency for the targets that depend on it)
install_make_share_root:
$(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_ROOT_FOLDER)
install_docs: install_make_share_root
$(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER) $(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)
$(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)/docs $(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)/docs
$(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)/charsets $(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)/charsets
@ -360,7 +367,7 @@ install_docs:
$(SED) $(SED_IN_PLACE) 's/\.\/hashcat/hashcat/' $(DESTDIR)$(DOCUMENT_FOLDER)/example400.sh $(SED) $(SED_IN_PLACE) 's/\.\/hashcat/hashcat/' $(DESTDIR)$(DOCUMENT_FOLDER)/example400.sh
$(SED) $(SED_IN_PLACE) 's/\.\/hashcat/hashcat/' $(DESTDIR)$(DOCUMENT_FOLDER)/example500.sh $(SED) $(SED_IN_PLACE) 's/\.\/hashcat/hashcat/' $(DESTDIR)$(DOCUMENT_FOLDER)/example500.sh
install_shared: install_shared: install_make_share_root
$(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER) $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)
$(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/OpenCL $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/OpenCL
$(INSTALL) -m 644 hashcat.hctune $(DESTDIR)$(SHARED_FOLDER)/ $(INSTALL) -m 644 hashcat.hctune $(DESTDIR)$(SHARED_FOLDER)/