Merge
authoramurillo
Tue, 23 Jun 2015 08:59:06 -0700
changeset 31224 e7824c4b8b40
parent 31219 86afedc80683 (diff)
parent 31223 1ae63197b768 (current diff)
child 31225 1b06d9da3dc3
child 31324 0c42e0382b0e
Merge
--- a/make/common/MakeBase.gmk	Thu Jun 18 22:38:34 2015 -0700
+++ b/make/common/MakeBase.gmk	Tue Jun 23 08:59:06 2015 -0700
@@ -369,8 +369,9 @@
 HGTIP_FILENAME=.hgtip
 HG_SEARCH = ./REPO ./*/REPO ./*/*/REPO ./*/*/*/REPO
 REPO_LIST = $(patsubst ./%,%,$(patsubst %/,%,$(sort $(dir \
-    $(shell $(CD) $(SRC_ROOT) ; ( $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) ; \
-        $(LS) $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) ) \
+    $(shell $(CD) $(SRC_ROOT) ; \
+        $(LS) -d $(HG_SEARCH:%/REPO=%/$(HG_DIRECTORY)) \
+            $(HG_SEARCH:%/REPO=%/$(HGTIP_FILENAME)) \
         2> /dev/null)))))
 
 # Emit the repo:tip pairs to $@