From: Dan Kalowsky <kalowsky@php.net>
Date: Thu, 15 Aug 2002 14:18:09 +0000 (+0000)
Subject: A fix suggested by chregu (who doesn't have karma) to re-enable older java
X-Git-Tag: php-4.3.0dev_zend2_alpha3~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1462813bfd0142a4c8d50a6d2b1fd916821e5494;p=php

A fix suggested by chregu (who doesn't have karma) to re-enable older java
JDKs to work.
---

diff --git a/ext/java/Makefile.frag b/ext/java/Makefile.frag
index db5d806f05..74c3ead1f0 100644
--- a/ext/java/Makefile.frag
+++ b/ext/java/Makefile.frag
@@ -7,7 +7,7 @@ $(srcdir)/php_java.jar : $(srcdir)/reflect.java
 	@echo library=php_java > $(srcdir)/net/php/reflect.properties
 	@$(JAVA_C) $(srcdir)/net/php/reflect.java
 	@test ! -f reflect.class || mv reflect.class $(srcdir)/net/php # bug in KJC javac
-	@$(JAVA_JAR) $(srcdir)/php_java.jar $(srcdir)/net/php/*.class $(srcdir)/net/php/*.properties
+	@$(JAVA_JAR) $(srcdir)/php_java.jar -C $(srcdir) net/php/reflect.class -C $(srcdir) net/php/reflect.properties
 	@rm $(srcdir)/net/php/reflect.*
 	@rmdir $(srcdir)/net/php
 	@rmdir $(srcdir)/net
diff --git a/ext/rpc/java/Makefile.frag b/ext/rpc/java/Makefile.frag
index db5d806f05..74c3ead1f0 100644
--- a/ext/rpc/java/Makefile.frag
+++ b/ext/rpc/java/Makefile.frag
@@ -7,7 +7,7 @@ $(srcdir)/php_java.jar : $(srcdir)/reflect.java
 	@echo library=php_java > $(srcdir)/net/php/reflect.properties
 	@$(JAVA_C) $(srcdir)/net/php/reflect.java
 	@test ! -f reflect.class || mv reflect.class $(srcdir)/net/php # bug in KJC javac
-	@$(JAVA_JAR) $(srcdir)/php_java.jar $(srcdir)/net/php/*.class $(srcdir)/net/php/*.properties
+	@$(JAVA_JAR) $(srcdir)/php_java.jar -C $(srcdir) net/php/reflect.class -C $(srcdir) net/php/reflect.properties
 	@rm $(srcdir)/net/php/reflect.*
 	@rmdir $(srcdir)/net/php
 	@rmdir $(srcdir)/net