You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2002/03/14 04:16:50 UTC
cvs commit: httpd-2.0/build .cvsignore rules.mk.in
trawick 02/03/13 19:16:50
Modified: . .cvsignore CHANGES Makefile.in acinclude.m4
build .cvsignore rules.mk.in
Log:
Fix apxs -g handling.
Move config_vars.mk from the top build directory to the build directory.
Get build/rules.mk cleaned up for distclean/extraclean.
PR: 10163
(This is the 2nd of two commits for that PR. The first was to
apxs.in -- rev 1.35.)
Revision Changes Path
1.9 +0 -1 httpd-2.0/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/httpd-2.0/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 17 Aug 2001 07:30:59 -0000 1.8
+++ .cvsignore 14 Mar 2002 03:16:49 -0000 1.9
@@ -14,7 +14,6 @@
config.status
modules.c
config.cache
-config_vars.mk
.libs
httpd
modules.lo
1.633 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.632
retrieving revision 1.633
diff -u -r1.632 -r1.633
--- CHANGES 13 Mar 2002 20:32:27 -0000 1.632
+++ CHANGES 14 Mar 2002 03:16:49 -0000 1.633
@@ -1,5 +1,8 @@
Changes with Apache 2.0.34-dev
+ *) Fix apxs -g handling. Move config_vars.mk from the top build
+ directory to the build directory. PR 10163 [Jeff Trawick]
+
*) Fix some mod_include problems which broke evaluation of some
expressions. PR 10108 [Jeff Trawick]
1.102 +5 -4 httpd-2.0/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/httpd-2.0/Makefile.in,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- Makefile.in 9 Mar 2002 19:29:18 -0000 1.101
+++ Makefile.in 14 Mar 2002 03:16:50 -0000 1.102
@@ -21,7 +21,8 @@
install-build
DISTCLEAN_TARGETS = include/ap_config_auto.h include/ap_config_path.h \
- modules.c config.cache config.log config.status config_vars.mk
+ modules.c config.cache config.log config.status build/config_vars.mk \
+ build/rules.mk
EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists
include $(top_builddir)/build/rules.mk
@@ -86,9 +87,9 @@
install-build:
@echo Installing build system files
@test -d $(installbuilddir) || $(MKINSTALLDIRS) $(installbuilddir)
- @sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
- config_vars.mk > $(installbuilddir)/config_vars.mk; \
- cp build/*.mk $(installbuilddir); \
+ @cp build/*.mk $(installbuilddir); \
+ sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
+ build/config_vars.mk > $(installbuilddir)/config_vars.mk; \
cp $(top_srcdir)/build/instdso.sh $(installbuilddir);
htdocs-srcdir = $(top_srcdir)/docs/docroot
1.115 +2 -2 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- acinclude.m4 6 Mar 2002 18:48:22 -0000 1.114
+++ acinclude.m4 14 Mar 2002 03:16:50 -0000 1.115
@@ -104,9 +104,9 @@
APACHE_MKDIR_P_CHECK
echo creating config_vars.mk
- > config_vars.mk
+ > build/config_vars.mk
for i in $APACHE_VAR_SUBST; do
- eval echo "$i = \$$i" >> config_vars.mk
+ eval echo "$i = \$$i" >> build/config_vars.mk
done
])
1.2 +1 -0 httpd-2.0/build/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/httpd-2.0/build/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Aug 2001 19:00:08 -0000 1.1
+++ .cvsignore 14 Mar 2002 03:16:50 -0000 1.2
@@ -1 +1,2 @@
rules.mk
+config_vars.mk
1.7 +1 -1 httpd-2.0/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/httpd-2.0/build/rules.mk.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rules.mk.in 13 Mar 2002 20:47:40 -0000 1.6
+++ rules.mk.in 14 Mar 2002 03:16:50 -0000 1.7
@@ -54,7 +54,7 @@
# The build environment was originally provided by Sascha Schumann.
#
-include $(top_builddir)/config_vars.mk
+include $(top_builddir)/build/config_vars.mk
# Combine all of the flags together in the proper order so that
# the user-defined flags can always override the configure ones, if needed.