diff options
| author | thommay <thommay@13f79535-47bb-0310-9956-ffa450edef68> | 2003-02-04 20:56:16 +0000 |
|---|---|---|
| committer | thommay <thommay@13f79535-47bb-0310-9956-ffa450edef68> | 2003-02-04 20:56:16 +0000 |
| commit | 258b05d7442a92daf7ecd55eeb39025300b0c216 (patch) | |
| tree | 595a210b686968f06aa53fe652e5cfd842dc228a | |
| parent | 49a9b18593b3d20705b905d7866171731c2b5a88 (diff) | |
| download | libapr-258b05d7442a92daf7ecd55eeb39025300b0c216.tar.gz | |
Rename rules.mk to apr_rules.mk and make it be installed.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64329 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | build/.cvsignore | 1 | ||||
| -rw-r--r-- | build/apr_rules.mk.in (renamed from build/rules.mk.in) | 0 | ||||
| -rw-r--r-- | configure.in | 10 |
5 files changed, 13 insertions, 5 deletions
@@ -1,5 +1,8 @@ Changes with APR 0.9.2 + *) Rename rules.mk to apr_rules.mk and make apr_rules.mk be installed. + [Thom May] + *) Fix a bug in apr_proc_create() that could cause a new child process to run the parent's code if setrlimit() fails. [Jeff Trawick] diff --git a/Makefile.in b/Makefile.in index b1a6b8352..9bd282e40 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,6 +84,10 @@ install: $(TARGET_LIB) if [ -f shlibtool ]; then \ $(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \ fi; + if [ -f build/apr_rules.mk ]; then \ + cp build/apr_rules.mk $(DESTDIR)$(installbuilddir); \ + fi; + if [ ! -d $(DESTDIR)$(bindir) ]; then \ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \ fi; diff --git a/build/.cvsignore b/build/.cvsignore index fc7683cab..7af82beb1 100644 --- a/build/.cvsignore +++ b/build/.cvsignore @@ -4,6 +4,7 @@ ltconfig ltmain.sh ltcf-c.sh rules.mk +apr_rules.mk LibD LibR Debug diff --git a/build/rules.mk.in b/build/apr_rules.mk.in index a23738738..a23738738 100644 --- a/build/rules.mk.in +++ b/build/apr_rules.mk.in diff --git a/configure.in b/configure.in index 9c8d1e670..892f4acd1 100644 --- a/configure.in +++ b/configure.in @@ -55,7 +55,7 @@ top_builddir="$apr_builddir" AC_SUBST(top_builddir) # Directory containing apr build macros, helpers, and make rules -# NOTE: make rules (rules.mk) will be in the builddir for vpath +# NOTE: make rules (apr_rules.mk) will be in the builddir for vpath # apr_buildout=$apr_builddir/build apr_builders=$apr_srcdir/build @@ -1889,14 +1889,14 @@ case $host in *bsdi*) # Check whether they've installed GNU make if make --version > /dev/null 2>&1; then - INCLUDE_RULES="include $apr_buildout/rules.mk" + INCLUDE_RULES="include $apr_buildout/apr_rules.mk" else # BSDi make - INCLUDE_RULES=".include \"$apr_buildout/rules.mk\"" + INCLUDE_RULES=".include \"$apr_buildout/apr_rules.mk\"" fi ;; *) - INCLUDE_RULES="include $apr_buildout/rules.mk" + INCLUDE_RULES="include $apr_buildout/apr_rules.mk" ;; esac AC_SUBST(INCLUDE_RULES) @@ -1913,7 +1913,7 @@ test -d $dir || $MKDIR $dir AC_OUTPUT([ $MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h - build/rules.mk + build/apr_rules.mk apr-config ],[ for i in $SAVE_FILES; do |