Commit 1da378bc authored by Joe Orton's avatar Joe Orton
Browse files

* 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
parent 74fdbcbc

build/config_vars.sh.in

+4 −0
Changes for build/config_vars.sh.in: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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},

build/rules.mk.in

+0 −2
Changes for build/rules.mk.in: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -54,8 +54,6 @@ MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(AL 


# 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)

configure.in

+6 −1
Changes for configure.in: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -303,12 +303,17 @@ dnl ## Check for programs 
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

AC_ISC_POSIX