diff options
| author | Joe Orton <jorton@apache.org> | 2005-06-13 15:19:42 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2005-06-13 15:19:42 +0200 |
| commit | f2f85151713c981e113fbdea3f1a747977d595d5 (patch) | |
| tree | 56b2d58395350eef1bac77e0ef64686c4563c3b3 /build/config_vars.sh.in | |
| parent | Sanitize the installed config_vars.mk to remove references to the (diff) | |
| download | apache2-f2f85151713c981e113fbdea3f1a747977d595d5.tar.xz apache2-f2f85151713c981e113fbdea3f1a747977d595d5.zip | |
* configure.in: Define MKINSTALLDIRS and INSTALL in config_vars.mk.
Don't use AC_PROG_INSTALL since any system "install" command is never
used anyway.
* build/rules.mk.in: Remove fixed reference to install.sh and mkdir.sh
in abs_srcdir.
* build/config_vars.sh: Munge definitions of MKINSTALLDIRS and INSTALL
to use installed scripts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190396 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build/config_vars.sh.in')
| -rw-r--r-- | build/config_vars.sh.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/build/config_vars.sh.in b/build/config_vars.sh.in index 23aea350dc..219c2b7b9f 100644 --- a/build/config_vars.sh.in +++ b/build/config_vars.sh.in @@ -28,6 +28,8 @@ APR_LIBTOOL="`${APR_CONFIG} --apr-libtool`" APR_INCLUDEDIR="`${APR_CONFIG} --includedir`" APU_INCLUDEDIR="`${APU_CONFIG} --includedir`" +installbuilddir="@exp_installbuilddir@" + exec sed " /^[A-Z_]*_LDADD/d /MPM_LIB/d @@ -52,6 +54,8 @@ exec sed " s, -I\$(top_srcdir)/[^ ]*,,g s, -I\$(top_builddir)/[^ ]*,,g } +/^MKINSTALLDIRS/s,\$(abs_srcdir)/build,$installbuilddir, +/^INSTALL /s,\$(abs_srcdir)/build,$installbuilddir, /^HTTPD_LDFLAGS/d /^UTIL_LDFLAGS/d /^APR_INCLUDEDIR.*$/s,.*,APR_INCLUDEDIR = ${APR_INCLUDEDIR}, |