svn commit: r190396 - in /httpd/httpd/trunk: build/config_vars.sh.in build/rules.mk.in configure.in

[jo...@apache.org]

Author: jorton
Date: Mon Jun 13 06:19:42 2005
New Revision: 190396

URL: http://svn.apache.org/viewcvs?rev=190396&view=rev
Log:
* 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.

Modified:
    httpd/httpd/trunk/build/config_vars.sh.in
    httpd/httpd/trunk/build/rules.mk.in
    httpd/httpd/trunk/configure.in

Modified: httpd/httpd/trunk/build/config_vars.sh.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/config_vars.sh.in?rev=190396&r1=190395&r2=190396&view=diff
==============================================================================
--- httpd/httpd/trunk/build/config_vars.sh.in (original)
+++ httpd/httpd/trunk/build/config_vars.sh.in Mon Jun 13 06:19:42 2005
@@ -28,6 +28,8 @@
 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 @@
   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},

Modified: httpd/httpd/trunk/build/rules.mk.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/build/rules.mk.in?rev=190396&r1=190395&r2=190396&view=diff
==============================================================================
--- httpd/httpd/trunk/build/rules.mk.in (original)
+++ httpd/httpd/trunk/build/rules.mk.in Mon Jun 13 06:19:42 2005
@@ -54,8 +54,6 @@
 
 # Helper programs
 
-MKINSTALLDIRS = $(abs_srcdir)/build/mkdir.sh
-INSTALL = $(LIBTOOL) --mode=install $(abs_srcdir)/build/install.sh -c
 INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_PROGRAM = $(INSTALL) -m 755 $(INSTALL_PROG_FLAGS)
 

Modified: httpd/httpd/trunk/configure.in
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/configure.in?rev=190396&r1=190395&r2=190396&view=diff
==============================================================================
--- httpd/httpd/trunk/configure.in (original)
+++ httpd/httpd/trunk/configure.in Mon Jun 13 06:19:42 2005
@@ -303,11 +303,16 @@
 AC_PATH_PROG(RM, rm)
 AC_PATH_PROG(PKGCONFIG, pkg-config)
 AC_PROG_AWK
-AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_CHECK_TOOL(RANLIB, ranlib, true)
 dnl AC_PATH_PROG(PERL_PATH, perl)
 AC_CHECK_PROGS(LYNX_PATH,[lynx links elinks], [lynx])
+
+# Hard-coded install programs
+MKINSTALLDIRS="\$(abs_srcdir)/build/mkdir.sh"
+INSTALL="\$(LIBTOOL) --mode=install \$(abs_srcdir)/build/install.sh -c"
+APACHE_SUBST(MKINSTALLDIRS)
+APACHE_SUBST(INSTALL)
 
 dnl various OS checks that apparently set required flags
 AC_AIX