You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by th...@apache.org on 2003/02/04 11:35:10 UTC
cvs commit: apr-util/build .cvsignore
thommay 2003/02/04 02:35:10
Modified: . buildconf configure.in
build .cvsignore
Log:
* buildconf: copy rules.mk from apr source tree.
* configure.in: use rules.mk in our tree instead of the one in apr's.
Submitted by: Garrett Rooney <ro...@electricjellyfish.net>
Reviewed by: Thom May
Revision Changes Path
1.8 +1 -1 apr-util/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/apr-util/buildconf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- buildconf 22 Jan 2003 17:45:20 -0000 1.7
+++ buildconf 4 Feb 2003 10:35:10 -0000 1.8
@@ -38,7 +38,7 @@
build/config.guess build/config.sub
cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
$apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \
- $apr_src_dir/build/config.sub build
+ $apr_src_dir/build/config.sub $apr_src_dir/build/rules.mk build
# Remove aclocal.m4 as it'll break some builds...
rm -rf aclocal.m4 autom4te*.cache
1.61 +3 -3 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- configure.in 22 Jan 2003 17:45:20 -0000 1.60
+++ configure.in 4 Feb 2003 10:35:10 -0000 1.61
@@ -134,13 +134,13 @@
*bsdi* | BSD/OS)
# Check whether they've installed GNU make
if make --version > /dev/null 2>&1; then
- INCLUDE_RULES="include $APR_BUILD_DIR/build/rules.mk"
+ INCLUDE_RULES="include $abs_srcdir/build/rules.mk"
else
- INCLUDE_RULES=".include \"$APR_BUILD_DIR/build/rules.mk\""
+ INCLUDE_RULES=".include \"$abs_srcdir/build/rules.mk\""
fi
;;
*)
- INCLUDE_RULES="include $APR_BUILD_DIR/build/rules.mk"
+ INCLUDE_RULES="include $abs_srcdir/build/rules.mk"
;;
esac
AC_SUBST(INCLUDE_RULES)
1.5 +1 -0 apr-util/build/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr-util/build/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 31 Jan 2003 00:24:43 -0000 1.4
+++ .cvsignore 4 Feb 2003 10:35:10 -0000 1.5
@@ -3,3 +3,4 @@
config.sub
find_apr.m4
install.sh
+rules.mk