diff --git a/make/CreateJars.gmk b/make/CreateJars.gmk index 9df8fd1d22a708a2092568b33f42316bd3690a0e..c1a07693d20cb09f15c3a9ec4cac09926644dac2 100644 --- a/make/CreateJars.gmk +++ b/make/CreateJars.gmk @@ -283,15 +283,15 @@ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.resources.jar.contents: $(IMAGES_OUTPUTDI -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \ $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp ifneq ($(PROFILE), ) + # Strip out all META-INF/services/ entries + $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2 ifneq ($(strip $(PROFILE_INCLUDE_METAINF_SERVICES)), ) - # Strip out all META-INF/services/ entries - $(GREP) -v -e 'META-INF/services/' $@.tmp > $@.tmp2 # Add back the required services for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \ $(ECHO) $$service >> $@.tmp2; \ done - $(MV) $@.tmp2 $@.tmp endif + $(MV) $@.tmp2 $@.tmp endif $(MV) $@.tmp $@