Fix --with-apr=/usr and/or --with-apr-util=/usr.

[apache] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index a7e73135adb53d9435c05a424b2f2243b8382a1c..738f51e3360e02ddff79162d5443de480212311f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,24 +4,24 @@ CLEAN_SUBDIRS = test
 
 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 = \
+  server/libmain.la \
   $(BUILTIN_LIBS) \
   $(MPM_LIB) \
-  server/libmain.la \
   os/$(OS_DIR)/libos.la
 
 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
+       install-other install-cgi install-include install-suexec install-build \
+       install-man
 
 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
@@ -91,10 +91,12 @@ install-conf:
 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
 
@@ -112,7 +114,7 @@ install-htdocs:
            echo Installing HTML documents ; \
            $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
            test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
-           cd $(DESTDIR)$(htdocsdir) && find . -name "CVS" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
 install-error:
@@ -122,7 +124,7 @@ 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" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
 install-icons:
@@ -132,7 +134,7 @@ 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" -type d -print | xargs rm -rf 2>/dev/null || true; \
+           test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
 install-cgi:
@@ -142,7 +144,7 @@ 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" -type d -print | xargs rm -rf 2>/dev/null || true; \
+          test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
        fi
 
 install-other:
@@ -173,11 +175,12 @@ install-include:
        @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)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir)
+       @cp -p $(srcdir)/modules/ssl/mod_ssl.h $(DESTDIR)$(includedir)
+       @cp -p $(builddir)/srclib/pcre/pcre.h $(DESTDIR)$(includedir)
        @cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)
        @chmod 644 $(DESTDIR)$(includedir)/*.h
 
@@ -190,7 +193,7 @@ install-man:
        @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
+       @(cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null ) || true
 
 install-suexec:
        @if test -f $(builddir)/support/suexec; then \