diff options
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | config.layout | 12 |
2 files changed, 21 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 84ea6ac63e..8a3dffc207 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,8 +16,9 @@ PROGRAM_DEPENDENCIES = \ 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-build +INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \ + install-other 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 @@ -71,6 +72,12 @@ install-htdocs: @test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual) @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;) +install-error: + @echo Installing error documents + @test -d $(errordir) || $(MKINSTALLDIRS) $(errordir) + @(cd docs/error && cp -rp * $(errordir)) + @(cd $(errordir) && find . -name "CVS" -print | xargs rm -rf {} \;) + install-icons: @echo Installing icons @test -d $(iconsdir) || $(MKINSTALLDIRS) $(iconsdir) diff --git a/config.layout b/config.layout index 4a55254dea..92ee999877 100644 --- a/config.layout +++ b/config.layout @@ -19,6 +19,7 @@ mandir: $prefix/man sysconfdir: $prefix/conf datadir: $prefix + errordir: $datadir/error iconsdir: $datadir/icons htdocsdir: $datadir/htdocs cgidir: $datadir/cgi-bin @@ -40,6 +41,7 @@ mandir: $prefix/man sysconfdir: $prefix/etc+ datadir: $prefix/share+ + errordir: $datadir/error iconsdir: $datadir/icons htdocsdir: $datadir/htdocs cgidir: $datadir/cgi-bin @@ -60,6 +62,7 @@ mandir: man sysconfdir: conf datadir: + errordir: error iconsdir: icons htdocsdir: htdocs cgidir: cgi-bin @@ -80,6 +83,7 @@ mandir: $exec_prefix/share/man sysconfdir: $prefix/Configuration datadir: $prefix + errordir: /System/Library/Apache/Error iconsdir: /System/Library/Apache/Icons htdocsdir: $datadir/Documents cgidir: $datadir/CGI-Executables @@ -100,6 +104,7 @@ mandir: $prefix/share/man datadir: /Library/WebServer sysconfdir: /etc+ + errordir: $prefix/share/httpd/error iconsdir: $prefix/share/httpd/icons htdocsdir: $datadir/Documents cgidir: $datadir/CGI-Executables @@ -120,6 +125,7 @@ mandir: $prefix/man sysconfdir: /etc/httpd/conf datadir: /home/httpd + errordir: $datadir/error iconsdir: $datadir/icons htdocsdir: $datadir/html cgidir: $datadir/cgi-bin @@ -140,6 +146,7 @@ mandir: $prefix/man sysconfdir: /etc$prefix datadir: $prefix/share + errordir: $datadir/error iconsdir: $datadir/icons htdocsdir: $datadir/htdocs cgidir: $datadir/cgi-bin @@ -160,6 +167,7 @@ mandir: $prefix/man sysconfdir: $prefix/conf datadir: $prefix + errordir: $datadir/error iconsdir: $datadir/icons htdocsdir: $datadir/htdocs cgidir: $datadir/cgi-bin @@ -180,6 +188,7 @@ mandir: $prefix/man sysconfdir: /etc/httpd datadir: /usr/local/httpd + errordir: $datadir/error iconsdir: $datadir/icons htdocsdir: $datadir/htdocs cgidir: $datadir/cgi-bin @@ -200,6 +209,7 @@ mandir: $exec_prefix/man sysconfdir: $prefix/conf datadir: $prefix + errordir: $datadir/error iconsdir: $datadir/icons htdocsdir: $datadir/htdocs cgidir: $datadir/cgi-bin @@ -220,6 +230,7 @@ mandir: $exec_prefix/man sysconfdir: /etc/apache datadir: /var/apache + errordir: $datadir/error iconsdir: $datadir/icons htdocsdir: $datadir/htdocs cgidir: $datadir/cgi-bin @@ -240,6 +251,7 @@ mandir: $exec_prefix/share/man sysconfdir: $prefix/conf datadir: $prefix + errordir: $prefix/error iconsdir: $prefix/icons htdocsdir: $prefix/htdocs cgidir: $prefix/cgi-bin |