1 files changed, 19 insertions, 16 deletions

diff --git a/Makefile.in b/Makefile.in
index 7a77d6d..27ba01f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@ LDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@
 
 EXTRA_DIST = INSTALL LICENSE CHANGELOG make_combined_log.pl
 
-TARGET = @PACKAGE_NAME@.la
+TARGET = @APACHE_OUTPUT_NAME@
 
 #Don't modify anything below here
 
@@ -44,7 +44,7 @@ DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(HEADERS)
 
 all: $(TARGET) all-subdirs
 
-all-subdirs install-subdirs update-subdirs clean-subdirs distclean-subdirs:
+all-subdirs install-subdirs activate-subdirs clean-subdirs distclean-subdirs:
         @otarget=`echo $@|sed s/-subdirs//`; \
         list=' $(PROVIDERS_SUBDIRS) $(SUBDIRS)'; \
         for i in $$list; do \
@@ -57,28 +57,30 @@ all-subdirs install-subdirs update-subdirs clean-subdirs distclean-subdirs:
                         fi; \
                         (cd $$i && $(MAKE) $$target) || exit 1; \
                 fi; \
-        done; \
+        done;
 
 $(TARGET):
-        @APXS_BIN@ -c -o @PACKAGE_NAME@.la $(INCLUDES) @MOD_SSL_CFLAGS@ $(CFLAGS) $(LDADD) @DEFS@ $(SOURCES) 
+        @@APXS_BIN@ -c -o $(TARGET) $(INCLUDES) @MOD_SSL_CFLAGS@ $(CFLAGS) \
+                $(LDADD) @DEFS@ @APACHE_DEFS@ $(SOURCES)
 
 include:
         rm -rf include
         ln -s @APACHE_INCDIR@ include
 
 install: install-subdirs
-        @APXS_BIN@ -i -a $(TARGET)
+        @@APXS_BIN@ -i $(TARGET)
 
-update: update-subdirs
-        @APXS_BIN@ -i $(TARGET)
+activate: activate-subdirs
+        @@APXS_BIN@ -i -a $(TARGET)
 
 clean: clean-subdirs
         $(RM) $(OBJ) $(SLO) $(LO) $(TARGET) .deps
+        $(RM) -r .libs
 
 distclean: clean distclean-subdirs
         $(RM) config.status config.log config.h config.h.in \
         configure stamp-h stamp-h.in Makefile aclocal.m4
-        $(RM) -r autom4te-2.53.cache .libs
+        $(RM) -r autom4te-2.53.cache
 
 DESTDIR = @PACKAGE_NAME@-@PACKAGE_VERSION@
 DESTTGZ = $(DESTDIR).tar.gz
@@ -97,27 +99,28 @@ dist:
                         echo $(NEWDESTDIR); \
                         (cd $$i && $(MAKE) DESTDIR=$(builddir)/$(DESTDIR)/$$i $$target) || exit 1; \
                 fi; \
-        done;
+        done; \
         if test "$$made_local" != "yes"; then \
                 $(MAKE) "local-dist" || exit 1; \
-        fi
-        tar -zcf $(DESTTGZ) $(DESTDIR)
-        rm -rf $(DESTDIR)
+        fi; \
+        tar -zcf $(DESTTGZ) $(DESTDIR); \
+        rm -rf $(DESTDIR); \
 
 local-dist: $(DISTFILES)
-        mkdir -p $(DESTDIR)
-        cp -dp --parents $(DISTFILES) $(DESTDIR)
+        @mkdir -p $(DESTDIR); \
+        cp -dp --parents $(DISTFILES) $(DESTDIR);
 
 $(builddir)/.deps: depend
 
 depend: $(SOURCES) $(HEADERS)
         if test -n "`ls $(srcdir)/*.c 2> /dev/null`"; then \
-                $(CC) -MM -I@APACHE_INCDIR@ @MOD_SSL_CFLAGS@ $(INCLUDES) -DHAVE_CONFIG_H $(srcdir)/*.c > $(builddir)/.deps || true; \
+                $(CC) -MM -I@APACHE_INCDIR@ @MOD_SSL_CFLAGS@ $(INCLUDES) @DEFS@ \
+                        @APACHE_DEFS@ $(srcdir)/*.c > $(builddir)/.deps || true; \
         fi
 
 include $(builddir)/.deps
 
-.PHONY: include all-subdirs update-subdirs install-subdirs \
+.PHONY: include all-subdirs activate-subdirs install-subdirs \
         clean-subdirs distclean-subdirs dist
 
 # Regenerate makefiles