Merge
authordcubed
Thu, 02 Jul 2015 14:12:18 -0700
changeset 31574 f7e952c5f980
parent 31325 51d168fe1fd0 (diff)
parent 31573 cafb7c8dbb94 (current diff)
child 31575 cf1261b1937f
Merge
make/jprt.properties
--- a/make/common/MakeBase.gmk	Thu Jun 25 20:47:45 2015 +0000
+++ b/make/common/MakeBase.gmk	Thu Jul 02 14:12:18 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 $@