You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2009/03/24 17:44:20 UTC
svn commit: r757896 - in /apr/apr/trunk: Makefile.in configure.in
Author: jorton
Date: Tue Mar 24 16:44:18 2009
New Revision: 757896
URL: http://svn.apache.org/viewvc?rev=757896&view=rev
Log:
* configure.in, Makefile.in: Fix "make install" for DSO builds.
Modified:
apr/apr/trunk/Makefile.in
apr/apr/trunk/configure.in
Modified: apr/apr/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=757896&r1=757895&r2=757896&view=diff
==============================================================================
--- apr/apr/trunk/Makefile.in (original)
+++ apr/apr/trunk/Makefile.in Tue Mar 24 16:44:18 2009
@@ -87,7 +87,7 @@
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 @@
$(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:
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=757896&r1=757895&r2=757896&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Tue Mar 24 16:44:18 2009
@@ -2474,7 +2474,7 @@
# 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