From 298c3ce165abee7c0d8206f0bc26e31b2d3a5be8 Mon Sep 17 00:00:00 2001
From: rbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 3 Apr 2001 20:32:06 +0000
Subject: Allow APR to be installed using `make install`

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@61446 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES     |  2 ++
 Makefile.in | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8d4580040..422db5fe8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with APR b1  
 
+  *) Allow APR to be installed. [Ryan Bloom]
+
   *) Generate config.nice for easy re-run of configure. [Roy Fielding]
 
   *) Define preprocessor flags in CPPFLAGS instead of CFLAGS and
diff --git a/Makefile.in b/Makefile.in
index cd4ed34c2..bacd6dca5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,8 +35,10 @@ EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \
 
 SCANDOC_TEMPLATE = -i$(apr_builders)/scandoc_template.pl
 
-### fix this up at some point (install location)
-libdir = /usr/local/lib
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
 
 delete-lib:
 	@if test -f $(TARGET_LIB); then \
@@ -48,6 +50,16 @@ delete-lib:
 	    fi \
 	fi
 
+install: $(TARGET_LIB)
+	if [ ! -d $(includedir) ]; then \
+	    ./build/mkdir.sh $(includedir); \
+	fi; \
+	cp include/*.h $(includedir); \
+	if [ ! -d $(libdir) ]; then \
+	    ./build/mkdir.sh $(libdir); \
+	fi; \
+	libtool --mode=install cp $(TARGET_LIB) $(libdir)
+
 $(TARGET_LIB):
 	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
 	    echo $(LINK) -rpath $(libdir) $$objects ; \
-- 
cgit v1.2.1