You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by rs...@hyperreal.org on 1998/05/28 12:38:49 UTC
cvs commit: modperl/apaci Makefile.tmpl configure
rse 98/05/28 03:38:49
Modified: apaci Makefile.tmpl configure
Log:
Repair the third build variant (outside Apache source tree via APXS) now that
the stuff resides inside the mod_perl tree but not at the same directory as
the source files. Now one can already again use
$ cd apaci
$ ./configure --with-perl=/path/to/bin/perl --with-apxs=/path/to/bin/apxs
$ make
$ make install
although we still have no "official" top-level support in Makefile.PL for this
variant.
Revision Changes Path
1.3 +2 -1 modperl/apaci/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/modperl/apaci/Makefile.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.tmpl 1998/05/22 08:24:05 1.2
+++ Makefile.tmpl 1998/05/28 10:38:48 1.3
@@ -29,6 +29,7 @@
MP_STATIC_OBJS=$(PERL_STATIC_OBJS)
MP_STATIC_OBJS_PIC=$(PERL_STATIC_OBJS_PIC)
MP_LIBS=$(PERL_LIBS)
+MP_DISTCLEAN_FILES=Makefile $(ADD_DISTCLEAN_FILES)
##
## ____ DO NOT CHANGE ANYTHING BELOW THIS LINE ______________________
@@ -80,7 +81,7 @@
$(MP_RM) perlxsi.c
distclean: clean
- $(MP_RM) Makefile
+ $(MP_RM) $(MP_DISTCLEAN_FILES)
# FOR STAND-ALONE BUILDING ONLY
install:
1.2 +12 -0 modperl/apaci/configure
Index: configure
===================================================================
RCS file: /export/home/cvs/modperl/apaci/configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- configure 1998/05/21 00:17:51 1.1
+++ configure 1998/05/28 10:38:49 1.2
@@ -16,6 +16,9 @@
my_config_override="$*"
my_makefileconf="Makefile"
my_makefiletmpl="Makefile.tmpl"
+my_sourcedir="../src/modules/perl"
+my_sourcefiles="mod_perl.c mod_perl.h perl_config.c perl_util.c perlio.c Apache.xs Constants.xs ModuleConfig.xs Tie.xs"
+my_typemapdir="../Apache"
# find APXS
my_apxs=""
@@ -70,6 +73,13 @@
# friendly header
echo "Configuring mod_perl for building via APXS" 2>&1
+# fetch the source files
+echo "$my_prefix Creating a local mod_perl source tree"
+for my_file in $my_sourcefiles; do
+ cp $my_sourcedir/$my_file .
+done
+cp $my_typemapdir/typemap .
+
# begin generation of Makefile
echo "##" >$my_makefileconf
echo "## Makefile -- mod_perl stand-alone build environment Makefile" >>$my_makefileconf
@@ -81,6 +91,8 @@
echo "RANLIB=ranlib" >>$my_makefileconf
echo "LIBEXT=so" >>$my_makefileconf
echo "APXS=$my_apxs" >>$my_makefileconf
+echo "# own special stuff" >>$my_makefileconf
+echo "ADD_DISTCLEAN_FILES=$my_sourcefiles typemap" >>$my_makefileconf
# transform mod_perl config into Makefile parameters
echo "$my_prefix Setting up mod_perl build environment (Makefile)"