mirror of
https://github.com/correl/melpa.git
synced 2024-11-15 03:00:14 +00:00
Merge pull request #1210 from milkypostman/timeout-makefile-fix
Allow Makefile to work if the "timeout" binary is not available
This commit is contained in:
commit
aaf0c5b758
1 changed files with 2 additions and 1 deletions
3
Makefile
3
Makefile
|
@ -17,6 +17,7 @@ endif
|
|||
|
||||
EVAL := $(EVAL) --no-site-file --batch -l package-build.el --eval
|
||||
|
||||
TIMEOUT := $(shell which timeout && echo "timeout -k 60 600")
|
||||
|
||||
all: packages packages/archive-contents json index
|
||||
|
||||
|
@ -75,7 +76,7 @@ $(RCPDIR)/.dirstamp: .FORCE
|
|||
$(RCPDIR)/%: .FORCE
|
||||
@echo " • Building recipe $(@F) ..."
|
||||
|
||||
- timeout -k 60 600 $(EVAL) "(package-build-archive '$(@F))"
|
||||
- $(TIMEOUT) $(EVAL) "(package-build-archive '$(@F))"
|
||||
|
||||
@echo " ✓ Wrote $$(ls -lsh $(PKGDIR)/$(@F)-*) "
|
||||
@echo " Sleeping for $(SLEEP) ..."
|
||||
|
|
Loading…
Reference in a new issue