diff options
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | configure.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index b23dc359a..c923ce833 100644 --- a/Makefile.in +++ b/Makefile.in @@ -87,7 +87,7 @@ apr-config.out: $(APR_CONFIG) build/apr_rules.out: build/apr_rules.mk sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@ -install: $(TARGETS) +install: install-modules $(TARGETS) $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) $(DESTDIR)$(installbuilddir) \ $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir) $(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir) @@ -116,7 +116,7 @@ install: $(TARGETS) $(TARGET_LIB): $(OBJECTS) $(LINK) @lib_target@ $(ALL_LIBS) -install-modules: install-modules-@APU_HAVE_MODULES@ +install-modules: install-modules-@APR_HAVE_MODULES@ install-modules-no: diff --git a/configure.in b/configure.in index 86336ee04..444cb2729 100644 --- a/configure.in +++ b/configure.in @@ -2474,7 +2474,7 @@ AC_SUBST(APRUTIL_LIBNAME) # Set up destination directory for DSOs. APR_DSO_LIBDIR="\${libdir}/apr-${APR_MAJOR_VERSION}" # Set APU_HAVE_MODULES appropriately for the Makefile -if test -n "$APR_MODULES"; then +if test -n "$APR_DSO_MODULES"; then APR_HAVE_MODULES=yes else APR_HAVE_MODULES=no |