From 111cedbbea8a5d62a163d40adc1de7f4ede7490d Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Thu, 18 Nov 1999 14:21:50 +0000 Subject: [PATCH] Moving apMakefile.{libdir,tmpl} to sapi/apache directory. --- apMakefile.libdir => sapi/apache/apMakefile.libdir | 0 apMakefile.tmpl => sapi/apache/apMakefile.tmpl | 2 +- sapi/apache/config.m4 | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename apMakefile.libdir => sapi/apache/apMakefile.libdir (100%) rename apMakefile.tmpl => sapi/apache/apMakefile.tmpl (98%) diff --git a/apMakefile.libdir b/sapi/apache/apMakefile.libdir similarity index 100% rename from apMakefile.libdir rename to sapi/apache/apMakefile.libdir diff --git a/apMakefile.tmpl b/sapi/apache/apMakefile.tmpl similarity index 98% rename from apMakefile.tmpl rename to 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= -- 2.40.0