8061924: demos target fails if users CDPATH is incorrectly set
Reviewed-by: erikj
Contributed-by: pointo1d@gmail.com
--- a/jdk/make/CompileDemos.gmk Thu Oct 23 13:44:28 2014 -0700
+++ b/jdk/make/CompileDemos.gmk Fri Oct 24 11:45:36 2014 +0200
@@ -154,9 +154,9 @@
(cd $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM && \
$(MKDIR) -p _the.tmp/META-INF/services && \
$(CP) $(DEMO_SHARE_SRC)/jfc/CodePointIM/java.awt.im.spi.InputMethodDescriptor _the.tmp/META-INF/services && \
- cd _the.tmp && \
+ cd ./_the.tmp && \
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar META-INF/services/java.awt.im.spi.InputMethodDescriptor && \
- cd META-INF/services && \
+ cd ./META-INF/services && \
$(JAR) uf $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/CodePointIM.jar java.awt.im.spi.InputMethodDescriptor)
$(RM) -r $(JDK_OUTPUTDIR)/demo/jfc/CodePointIM/_the.tmp
$(TOUCH) $@