summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-11-18 14:21:50 +0000
committerSascha Schumann <sas@php.net>1999-11-18 14:21:50 +0000
commit111cedbbea8a5d62a163d40adc1de7f4ede7490d (patch)
tree139dde13491ab2c6365a222561d482e3f87dd7e2
parent560c0c4308fa14aebfb0b7a84f18de15b2f65e90 (diff)
downloadphp-git-111cedbbea8a5d62a163d40adc1de7f4ede7490d.tar.gz
Moving apMakefile.{libdir,tmpl} to sapi/apache directory.
-rw-r--r--sapi/apache/apMakefile.libdir (renamed from apMakefile.libdir)0
-rw-r--r--sapi/apache/apMakefile.tmpl (renamed from apMakefile.tmpl)2
-rw-r--r--sapi/apache/config.m44
3 files changed, 3 insertions, 3 deletions
diff --git a/apMakefile.libdir b/sapi/apache/apMakefile.libdir
index 7b5254013a..7b5254013a 100644
--- a/apMakefile.libdir
+++ b/sapi/apache/apMakefile.libdir
diff --git a/apMakefile.tmpl b/sapi/apache/apMakefile.tmpl
index e396f65051..c485d1785f 100644
--- a/apMakefile.tmpl
+++ b/sapi/apache/apMakefile.tmpl
@@ -12,7 +12,7 @@ OBJS_LIB=libmodphp4.a
# objects for building the shared object library
SHLIB_OBJS=mod_php4.so-o
-SHLIB_OBJS_LIB=libmodphp4-so.a
+SHLIB_OBJS_LIB=libmodphp4.a
# the general targets
all: lib
diff --git a/sapi/apache/config.m4 b/sapi/apache/config.m4
index c70a04b13d..9ebdad0b3d 100644
--- a/sapi/apache/config.m4
+++ b/sapi/apache/config.m4
@@ -69,7 +69,7 @@ AC_ARG_WITH(apache,
mkdir $APACHE_TARGET
fi
PHP_SAPI=apache
- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - Apache 1.3.x)
@@ -100,7 +100,7 @@ AC_ARG_WITH(apache,
fi
PHP_SAPI=apache
PHP_LIBS="-Lmodules/php4 -L../modules/php4 -L../../modules/php4 -lmodphp4"
- APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
+ APACHE_INSTALL="mkdir -p $APACHE_TARGET; cp $SAPI_STATIC $APACHE_TARGET/libmodphp4.a; cp $APACHE_INSTALL_FILES $APACHE_TARGET; cp $srcdir/sapi/apache/apMakefile.tmpl $APACHE_TARGET/Makefile.tmpl; cp $srcdir/sapi/apache/apMakefile.libdir $APACHE_TARGET/Makefile.libdir"
AC_DEFINE(APACHE)
AC_MSG_RESULT(yes - Apache 1.3.x)
STRONGHOLD=