make/CreateJars.gmk

*** 281,299 ****
          $(RM) $@ $@.tmp
          $(GREP) -v -e '\.class$$' \
              -e '/_the\.*' -e '^_the\.*' -e '\\_the\.*' -e 'javac_state' \
              $(IMAGES_OUTPUTDIR)/lib$(PROFILE)/_the.jars.contents > $@.tmp
          ifneq ($(PROFILE), )
-           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
          endif
          $(MV) $@.tmp $@
  
  # This is a hack but I don't know how to make this fit into the existing scheme
  $(PROFILE_VERSION_CLASS_TARGETS): $(PROFILE_VERSION_JAVA_TARGETS)
--- 281,299 ----
          $(RM) $@ $@.tmp
          $(GREP) -v -e '\.class$$' \
              -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)), )
              # Add back the required services
              for service in $(PROFILE_INCLUDE_METAINF_SERVICES) ; do \
                $(ECHO) $$service >> $@.tmp2; \
              done
            endif
+           $(MV) $@.tmp2 $@.tmp
          endif
          $(MV) $@.tmp $@
  
  # This is a hack but I don't know how to make this fit into the existing scheme
  $(PROFILE_VERSION_CLASS_TARGETS): $(PROFILE_VERSION_JAVA_TARGETS)