diff options
| author | jerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68> | 2002-03-09 19:26:13 +0000 |
|---|---|---|
| committer | jerenkrantz <jerenkrantz@13f79535-47bb-0310-9956-ffa450edef68> | 2002-03-09 19:26:13 +0000 |
| commit | 7cc77834c798f69bc811ee5998415ffba2fe4981 (patch) | |
| tree | fda982abdf00e79ee07e18ade93c87ec6c1da156 /Makefile.in | |
| parent | ebd287a6bcc24493077934f24be9ef937ef3b854 (diff) | |
| download | libapr-7cc77834c798f69bc811ee5998415ffba2fe4981.tar.gz | |
Allow APR to install its own libtool into an installbuilddir.
Add --with-installbuilddir to configure.
Add --apr-libtool option to apr-config so that third-parties can figure
out where this generated libtool is.
(Previously, httpd-2.0 would copy libtool for APR which isn't very nice.)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@63098 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 0df0faf37..25209241b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,6 +40,7 @@ exec_prefix=@exec_prefix@ bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ +installbuilddir=@installbuilddir@ srcdir=@srcdir@ top_srcdir=@top_srcdir@ top_blddir=@top_builddir@ @@ -59,15 +60,24 @@ delete-lib: install: $(TARGET_LIB) if [ ! -d $(includedir) ]; then \ $(top_srcdir)/build/mkdir.sh $(includedir); \ - fi; \ - cp $(top_srcdir)/include/*.h $(includedir); \ - cp $(top_blddir)/include/*.h $(includedir); \ + fi; + cp $(top_srcdir)/include/*.h $(includedir); + cp $(top_blddir)/include/*.h $(includedir); if [ ! -d $(libdir) ]; then \ $(top_srcdir)/build/mkdir.sh $(libdir); \ - fi; \ + fi; $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir) $(LIBTOOL) --mode=install cp APRVARS $(libdir) $(LIBTOOL) --mode=install cp apr.exp $(libdir) + if [ ! -d $(installbuilddir) ]; then \ + $(top_srcdir)/build/mkdir.sh $(installbuilddir); \ + fi; + if [ -f libtool ]; then \ + $(LIBTOOL) --mode=install cp libtool $(installbuilddir); \ + fi; + if [ -f shlibtool ]; then \ + $(LIBTOOL) --mode=install cp shlibtool $(installbuilddir); \ + fi; if [ ! -d $(bindir) ]; then \ $(top_srcdir)/build/mkdir.sh $(bindir); \ fi; @@ -77,7 +87,7 @@ install: $(TARGET_LIB) for i in $(INSTALL_SUBDIRS); do \ ( cd $$i ; $(MAKE) install ); \ done \ - fi + fi $(TARGET_LIB): @for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \ |