From 194df6f9bd97a019d1c57f02fa68ea253231ed74 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@apache.org>
Date: Tue, 24 Mar 2009 15:26:04 +0000
Subject: * Makefile.in, configure.in: s/APU/APR/ in DSO handling code.   Use
 default install prefix of $libdir/apr-$major/

* util-misc/apu_dso.c: Update likewise.


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@757845 13f79535-47bb-0310-9956-ffa450edef68
---
 Makefile.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 5ecf899f6..c10a232d0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -32,15 +32,15 @@ APR_CONFIG = apr-$(APR_MAJOR_VERSION)-config
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-APU_MODULES = @APU_MODULES@
-LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
-APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
+APR_MODULES = @APR_MODULES@
+LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APR_DSO_LIBDIR)
+APR_DSO_LIBDIR = @APR_DSO_LIBDIR@
 
 #
 # Rules for building specific targets, starting with 'all' for
 # building the entire package.
 #
-TARGETS = $(TARGET_LIB) $(APU_MODULES) \
+TARGETS = $(TARGET_LIB) $(APR_MODULES) \
 	apr.exp apr-config.out build/apr_rules.out
 
 LT_VERSION = @LT_VERSION@
@@ -106,9 +106,9 @@ install-modules: install-modules-@APU_HAVE_MODULES@
 
 install-modules-no:
 
-install-modules-yes: $(APU_MODULES)
-	$(APR_MKDIR) $(DESTDIR)$(APU_DSO_LIBDIR)
-	@for m in $(APU_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done
+install-modules-yes: $(APR_MODULES)
+	$(APR_MKDIR) $(DESTDIR)$(APR_DSO_LIBDIR)
+	@for m in $(APR_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL) -m 755 $$m $(DESTDIR)$(APR_DSO_LIBDIR); done
 
 exports.c: $(HEADERS)
 	$(APR_MKEXPORT) $(HEADERS) > $@
-- 
cgit v1.2.1