Commit aff900be authored by Ryan Bloom's avatar Ryan Bloom
Browse files

Install all build/*.mk when we install Apache. This is the first step 

to getting apxs to use the same makefiles as Apache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89776 13f79535-47bb-0310-9956-ffa450edef68
parent a65a1207

Makefile.in

+8 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ PROGRAMS = $(PROGRAM_NAME) 
TARGETS         = $(PROGRAMS) $(shared_build) $(other_targets)

PHONY_TARGETS   = $(srcdir)/buildmark.c

INSTALL_TARGETS = install-conf install-htdocs install-icons install-other \

	install-cgi install-include install-suexec install-man

	install-cgi install-include install-suexec install-man install-build



DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \

	modules.c config.cache config.log config.status config_vars.mk
@@ -47,6 +47,13 @@ install-conf: 
		fi; \

	done



install-build:

	@echo Installing build system files 

	@test -d $(installbuilddir) || $(MKINSTALLDIRS) $(installbuilddir) 

	@cp config_vars.mk $(installbuilddir); \

	cd build; \

	cp *.mk $(installbuilddir);



htdocs-srcdir = docs/docroot



docs::

acinclude.m4

+3 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ 
  APACHE_SUBST(includedir)

  APACHE_SUBST(iconsdir)

  APACHE_SUBST(sysconfdir)

  APACHE_SUBST(installbuilddir)

  APACHE_SUBST(other_targets)

  APACHE_SUBST(progname)

  APACHE_SUBST(prefix)
@@ -255,7 +256,7 @@ AC_DEFUN(APACHE_LAYOUT,[ 
  rm $pldconf

  for var in prefix exec_prefix bindir sbindir libexecdir mandir \

             sysconfdir datadir iconsdir htdocsdir cgidir includedir \

             localstatedir runtimedir logfiledir proxycachedir; do

             localstatedir runtimedir logfiledir proxycachedir installbuilddir; do

    eval "val=\"\$$var\""

    case $val in

      *+)
@@ -304,6 +305,7 @@ if test -z "$LAYOUT"; then 
  libexecdir='${prefix}/modules'

  mandir='${prefix}/man'

  layout_name=Apache

  installbuilddir='${prefix}/build'

else 

  APACHE_LAYOUT($srcdir/config.layout, $LAYOUT)

fi