diff -r b80fdcc0b0d5 -r bd98409d8c32 jdk/make/sun/splashscreen/Makefile --- a/jdk/make/sun/splashscreen/Makefile Mon Aug 24 18:37:37 2009 +0100 +++ b/jdk/make/sun/splashscreen/Makefile Tue Aug 25 15:14:53 2009 -0700 @@ -77,13 +77,13 @@ vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen vpath %.c $(SHARE_SRC)/native/$(PKGDIR) vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/giflib -vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 +vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/libpng vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen -CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3 +CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION) # Shun the less than portable MMX assembly code in pnggccrd.c, # and use alternative implementations in C.