PROGRAM_NAME = $(progname)
PROGRAM_SOURCES = modules.c
-PROGRAM_LDADD = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+PROGRAM_LDADD = $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
PROGRAM_DEPENDENCIES = \
$(BUILTIN_LIBS) \
$(MPM_LIB) \
PROGRAMS = $(PROGRAM_NAME)
TARGETS = $(PROGRAMS) $(shared_build) $(other_targets)
-PHONY_TARGETS = $(srcdir)/buildmark.c
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_layout.h \
modules.c config.cache config.log config.status build/config_vars.mk \
- build/rules.mk docs/conf/httpd-std.conf
-EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists
+ build/rules.mk docs/conf/httpd-std.conf docs/conf/ssl-std.conf shlibtool
+EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \
+ httpd.spec
include $(top_builddir)/build/rules.mk
include $(top_srcdir)/build/program.mk
install-conf:
@echo Installing configuration files ; \
- if [ -d $(DESTDIR)$(sysconfdir) ]; then \
+ if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \
$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) ; \
fi ; \
- cd $(top_srcdir)/docs/conf; \
- for i in mime.types magic; do \
- if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
- $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
- fi; \
- done; \
- for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
- cd $$j ; \
- for i in *-std*.conf ssl.conf; do \
- [ -f $$i ] || continue; \
+ cd $(top_srcdir)/docs/conf; \
+ for i in mime.types magic; do \
+ if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+ $(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir); \
+ fi; \
+ done; \
+ for j in $(top_srcdir)/docs/conf $(top_builddir)/docs/conf ; do \
+ cd $$j ; \
+ for i in *-std*.conf; do \
( \
n_lm=`awk 'BEGIN {n=0} /@@LoadModule@@/ {n+=1} END {print n}' < $$i`; \
if test $$n_lm -eq 0 -o "x$(DSO_MODULES)" = "x"; then \
$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/$$i $(DESTDIR)$(sysconfdir)/$$file; \
fi; \
done ; \
- done ; \
- if test -f "$(builddir)/envvars-std"; then \
- cp -p envvars-std $(DESTDIR)$(sbindir); \
- if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
- cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
- fi ; \
+ done ; \
+ if test -f "$(builddir)/envvars-std"; then \
+ cp -p envvars-std $(DESTDIR)$(sbindir); \
+ if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+ cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+ fi ; \
fi
install-build:
@echo Installing build system files
@test -d $(DESTDIR)$(installbuilddir) || $(MKINSTALLDIRS) $(DESTDIR)$(installbuilddir)
- @cp build/*.mk $(DESTDIR)$(installbuilddir); \
+ @cp $(top_srcdir)/build/*.mk $(DESTDIR)$(installbuilddir); \
+ cp build/*.mk $(DESTDIR)$(installbuilddir); \
sed 's#LIBTOOL = \(.*\)#LIBTOOL = $(SHELL) $(installbuilddir)/libtool $(LTFLAGS)#' \
build/config_vars.mk > $(DESTDIR)$(installbuilddir)/config_vars.mk; \
- cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir);
+ cp $(top_srcdir)/build/instdso.sh $(DESTDIR)$(installbuilddir); \
+ cp $(top_builddir)/config.nice $(DESTDIR)$(installbuilddir);
htdocs-srcdir = $(top_srcdir)/docs/docroot
echo Installing HTML documents ; \
$(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
- fi
- -@if [ -d $(DESTDIR)$(manualdir) ]; then \
- echo "[PRESERVING EXISTING MANUAL SUBDIR: $(DESTDIR)$(manualdir)]"; \
- else \
- $(MKINSTALLDIRS) $(DESTDIR)$(manualdir) ; \
- test -d $(top_srcdir)/docs/manual && (cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir)) ; \
- test "x$(htdocsdir)" != "x" && cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+ cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi
install-error:
echo Installing error documents ; \
$(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
- test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -print | xargs rm -rf ; \
+ test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi
install-icons:
echo Installing icons ; \
$(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
- test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -print | xargs rm -rf ; \
+ test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi
install-cgi:
echo Installing CGIs ; \
$(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
- test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -print | xargs rm -rf ; \
+ test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
fi
install-other:
cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(DESTDIR)$(includedir); \
fi;
@cp -p $(srcdir)/server/mpm/$(MPM_SUBDIR_NAME)/*.h $(DESTDIR)$(includedir)
+ @cp -p $(srcdir)/modules/aaa/mod_auth.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/dav/main/mod_dav.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/filters/mod_include.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/generators/mod_cgi.h $(DESTDIR)$(includedir)
+ @cp -p $(srcdir)/modules/generators/mod_status.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/loggers/mod_log_config.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)
- @cp -p $(srcdir)/modules/ssl/*.h $(DESTDIR)$(includedir)
+ @cp -p $(srcdir)/modules/ssl/mod_ssl.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir)
@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)
@chmod 644 $(DESTDIR)$(includedir)/*.h
install-man:
- @echo Installing man pages
+ @echo Installing man pages and online manual
@test -d $(DESTDIR)$(mandir) || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
+ @test -d $(DESTDIR)$(manualdir) || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
+ @(cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir))
+ @(cd $(DESTDIR)$(manualdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null ) || true
install-suexec:
@if test -f $(builddir)/support/suexec; then \
projects / apache / blobdiff