X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=rules.mk;h=09b4f5447a9d6e56ab5ef3022375e6b49c4c5708;hb=0d01356fc69e536f51d8694689bf1b55ea4b508d;hp=007e5bc9b2f8176ddfcfbd0b880baf9b8ef9664a;hpb=e396e33ad2ea10633c42ec4c580770cb92148dbc;p=lede.git

diff --git a/rules.mk b/rules.mk
index 007e5bc9b2..09b4f5447a 100644
--- a/rules.mk
+++ b/rules.mk
@@ -28,6 +28,10 @@ merge=$(subst $(space),,$(1))
 confvar=$(call merge,$(foreach v,$(1),$(if $($(v)),y,n)))
 strip_last=$(patsubst %.$(lastword $(subst .,$(space),$(1))),%,$(1))
 
+define sep
+
+endef
+
 _SINGLE=export MAKEFLAGS=$(space);
 CFLAGS:=
 ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
@@ -252,11 +256,11 @@ endef
 # Execute commands under flock
 # $(1) => The shell expression.
 # $(2) => The lock name. If not given, the global lock will be used.
-# $(3) => The filedescriptor used for the lock. Defaults to 1023.
 define locked
-    ( $(STAGING_DIR_HOST)/bin/flock -x $(if $(3),$(3),1023) && \
-      $(1) \
-    ) $(if $(3),$(strip $(3)),1023)>$(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock
+	SHELL= \
+	$(STAGING_DIR_HOST)/bin/flock \
+		$(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock \
+		-c '$(subst ','\'',$(1))'
 endef
 
 # file extension