From: Sam Ruby <rubys@php.net>
Date: Tue, 7 Mar 2000 15:41:34 +0000 (+0000)
Subject: Sapi/servlet build on Unix broken
X-Git-Tag: PHP-4.0-RC1~238
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa56e42b08c3401e4faaab82cc8d6f09a5ed0512;p=php

Sapi/servlet build on Unix broken
---

diff --git a/sapi/servlet/Makefile.in b/sapi/servlet/Makefile.in
index bcb895253e..21b5947998 100644
--- a/sapi/servlet/Makefile.in
+++ b/sapi/servlet/Makefile.in
@@ -21,13 +21,15 @@ phpsrvlt.jar : servlet.java ../../ext/java/reflect.java
 	@test -e net/php || mkdir net/php
 	@echo library=php4>net/php/reflect.properties
 	@echo library=php4>net/php/servlet.properties
+	@cp formatter.java net/php
 	@cp servlet.java net/php
 	@cp ../../ext/java/reflect.java net/php
 	javac net/php/reflect.java
 	@test ! -f reflect.class || mv reflect.class net/php # bug in KJC javac
 	javac -classpath .:$(SERVLET_CLASSPATH):$(JAVA_CLASSPATH) net/php/servlet.java
-	javac net/php/formatter.java
 	@test ! -f servlet.class || mv servlet.class net/php # bug in KJC javac
+	javac net/php/formatter.java
+	@test ! -f formatter.class || mv formatter.class net/php # bug in KJC javac
 	$(JAVA_JAR) phpsrvlt.jar net/php/*.class net/php/*.properties
 	@rm net/php/servlet.* net/php/reflect.* net/php/formatter.*
 	@rmdir net/php
diff --git a/sapi/servlet/config.m4 b/sapi/servlet/config.m4
index 94e49bfcf1..0dbb3178e5 100644
--- a/sapi/servlet/config.m4
+++ b/sapi/servlet/config.m4
@@ -26,8 +26,8 @@ AC_ARG_WITH(servlet,
 
     AC_DEFINE(SAPI_SERVLET, 1, [Whether you use Servlet])
 
-    INSTALL_IT="\$(INSTALL) -m 0755 \$(srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)/$SAPI_CGI"
-    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(libdir)/$SAPI_CGI"
+    INSTALL_IT="\$(INSTALL) -m 0755 \$(srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)"
+    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(libdir)"
     PHP_EXTENSION(servlet, "shared")
     PHP_SAPI=servlet
     PHP_BUILD_SHARED