Commit 9d498e22 authored by Ryan Bloom's avatar Ryan Bloom
Browse files

install the man pages when we install everything else. 

PR:	7754


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

Makefile.in

+9 −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-cgi install-include install-suexec install-man



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

	modules.c config.cache config.log config.status config_vars.mk
@@ -106,6 +106,14 @@ install-include: 
	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(includedir)

	@chmod 644 $(includedir)/*.h



install-man:

	@echo Installing man pages

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

	@test -d $(mandir)/man1 || $(MKINSTALLDIRS) $(mandir)/man1

	@test -d $(mandir)/man8 || $(MKINSTALLDIRS) $(mandir)/man8

	@cp -p docs/man/*.1 $(mandir)/man1

	@cp -p docs/man/*.8 $(mandir)/man8



install-suexec:

	@if test -f $(builddir)/support/suexec; then \

            test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir); \

acinclude.m4

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[ 
  APACHE_SUBST(exec_prefix)

  APACHE_SUBST(datadir)

  APACHE_SUBST(localstatedir)

  APACHE_SUBST(mandir)

  APACHE_SUBST(libexecdir)

  APACHE_SUBST(htdocsdir)

  APACHE_SUBST(includedir)
@@ -301,6 +302,7 @@ if test -z "$LAYOUT"; then 
  logfiledir='$(prefix)/logs'

  sysconfdir='${prefix}/conf'

  libexecdir='${prefix}/modules'

  mandir='${prefix}/man'

  layout_name=Apache

else 

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