From ad18ce3192c57ff6a6bbb9ffb08730edfdd4da17 Mon Sep 17 00:00:00 2001
From: Jim Laskey <jlaskey@openjdk.org>
Date: Thu, 9 Jun 2016 11:12:18 -0300
Subject: [PATCH] 8158402: jlink: should use regex for all pattern operations
 (--order-resources or --exclude-resources)

Reviewed-by: sundar
---
 make/Images.gmk | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/make/Images.gmk b/make/Images.gmk
index c3e93a47a97..385b741bb58 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -115,16 +115,16 @@ JMODS := $(wildcard $(IMAGES_OUTPUTDIR)/jmods/*.jmod)
 # Use this file inside the image as target for make rule
 JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
 
-JLINK_ORDER_RESOURCES := *module-info.class*
+JLINK_ORDER_RESOURCES := **module-info.class
 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
   JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist
 endif
 JLINK_ORDER_RESOURCES += \
-    /java.base/java/* \
-    /java.base/jdk/* \
-    /java.base/sun/* \
-    /java.base/com/* \
-    /jdk.localedata/* \
+    /java.base/java/** \
+    /java.base/jdk/** \
+    /java.base/sun/** \
+    /java.base/com/** \
+    /jdk.localedata/** \
     #
 
 JLINK_TOOL := $(JLINK) --modulepath $(IMAGES_OUTPUTDIR)/jmods \