From 08caf71adedfb791d4fea19674f135057db5997b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 3 Jun 2014 19:47:00 -0400 Subject: minor fixes to the main Makefile --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 49a54b9..9b54ce7 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ $(foreach package,$(packages),$(if $(filter-out svn|%,$($(package))),$(eval \ # place (patch) ################################################################ -place: PHONY $(addprefix,build/workdir/,$(packages)) +place: PHONY $(addprefix build/workdir/,$(packages)) $(addprefix build/workdir/,$(packages)): \ build/workdir/%: @@ -90,7 +90,7 @@ build/workdir/%: mkdir -p '$(@D)' cp -a '$<' '$@' cd '$@' && \ - for patch in $(wildcard $(top)/rules/$*/*.patch); do \ + for patch in $(sort $(wildcard $(top)/rules/$*/*.patch)); do \ patch -f -Np1 -i $$patch || { rm -rf '$@'; exit 1; }; \ done && \ if [ -f '$(top)/rules/$*/delete.list' ]; then \ @@ -102,6 +102,7 @@ build/workdir/%: $(foreach package,$(packages),$(eval \ build/workdir/$(package): \ build/extract/$(shell utils/spec2file '$($(package))') \ + $(shell find rules/$(package) 2>/dev/null) \ )) # package ###################################################################### -- cgit v1.2.2