From cvs-return-989-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Tue Apr 03 22:50:38 2001 Return-Path: Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 23919 invoked by uid 500); 3 Apr 2001 22:50:36 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 23809 invoked by uid 500); 3 Apr 2001 22:50:35 -0000 Delivered-To: apmail-apr-util-cvs@apache.org Date: 3 Apr 2001 22:50:34 -0000 Message-ID: <20010403225034.23739.qmail@apache.org> From: rbb@apache.org To: apr-util-cvs@apache.org Subject: cvs commit: apr-util Makefile.in rbb 01/04/03 15:50:34 Modified: . Makefile.in Log: Allow apr-util to be installed. Revision Changes Path 1.23 +14 -2 apr-util/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apr-util/Makefile.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -b -w -u -r1.22 -r1.23 --- Makefile.in 2001/02/18 16:01:28 1.22 +++ Makefile.in 2001/04/03 22:50:34 1.23 @@ -20,8 +20,10 @@ EXTRACLEAN_TARGETS = configure libtool aclocal.m4 \ include/private/apu_config.h.in -### 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 \ @@ -32,6 +34,16 @@ $(RM) -f $(TARGET_LIB) ; \ fi \ fi + +install: $(TARGET_LIB) + if [ ! -d $(includedir) ]; then \ + @APR_SOURCE_DIR@/build/mkdir.sh $(includedir); \ + fi; \ + cp include/*.h $(includedir); \ + if [ ! -d $(libdir) ]; then \ + @APR_SOURCE_DIR@/build/mkdir.sh $(libdir); \ + fi; \ + libtool --mode=install cp $(TARGET_LIB) $(libdir) $(TARGET_LIB): @objects="`find $(SUBDIRS) -name '*.lo'`" ; \