diff options
author | maxb <maxb@13f79535-47bb-0310-9956-ffa450edef68> | 2006-03-07 15:51:46 +0000 |
---|---|---|
committer | maxb <maxb@13f79535-47bb-0310-9956-ffa450edef68> | 2006-03-07 15:51:46 +0000 |
commit | 044167de5336cc5fd16300410cd4e703d1596d5f (patch) | |
tree | 41004c5336b3d453e113a86232105470a37f71a4 /Makefile.in | |
parent | abfad51cec120b4eabb8edcb510d980ce06f46b0 (diff) | |
download | libapr-044167de5336cc5fd16300410cd4e703d1596d5f.tar.gz |
Backport r65212, r65249, r65250, r65251 from trunk to 0.9.x.
Install mkdir.sh, make_exports.awk, make_var_export.awk to the APR
installbuilddir, and provide working accessor variables in apr_rules.mk.
* Makefile.in (CLEAN_TARGETS): Add "build/apr_rules.out".
(build/apr_rules.out): New rule to create by changing build-dir paths to
installed paths.
(install): Depend on build/apr_rules.out, and install it as apr_rules.mk.
Also install mkdir.sh, make_exports.awk and make_var_export.awk.
(exports.c, export_vars.c): Use new make-variable defined in apr_rules.mk.
* build/apr_rules.mk.in (MKEXPORT): Remove obsolete definition which is broken
anyway, since it refers to a nonexistant file.
(APR_MKDIR, APR_MKEXPORT, APR_MKVAREXPORT): New definitions
- the commands to run various installbuilddir tools.
* CHANGES: Update.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/0.9.x@383913 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index bca963442..42139ea97 100644 --- a/Makefile.in +++ b/Makefile.in @@ -31,7 +31,8 @@ TARGETS = delete-lib $(TARGET_LIB) delete-exports export_vars.c apr.exp # bring in rules.mk for standard functionality @INCLUDE_RULES@ -CLEAN_TARGETS = apr.exp exports.c export_vars.c apr-config.out +CLEAN_TARGETS = apr.exp exports.c export_vars.c apr-config.out \ + build/apr_rules.out DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ libtool apr-config @@ -64,7 +65,11 @@ delete-lib: apr-config.out: apr-config sed 's,^\(location=\).*$$,\1installed,' < apr-config > $@ -install: $(TARGET_LIB) apr-config.out +# Create apr_rules.mk suitable for the install tree +build/apr_rules.out: build/apr_rules.mk + sed 's,^\(apr_build.*=\).*$$,\1$(installbuilddir),' < build/apr_rules.mk > $@ + +install: $(TARGET_LIB) apr-config.out build/apr_rules.out if [ ! -d $(DESTDIR)$(includedir) ]; then \ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \ fi; @@ -87,10 +92,10 @@ install: $(TARGET_LIB) apr-config.out if [ -f shlibtool ]; then \ $(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \ fi; - if [ -f build/apr_rules.mk ]; then \ - cp build/apr_rules.mk $(DESTDIR)$(installbuilddir); \ - fi; - + for f in mkdir.sh make_exports.awk make_var_export.awk; do \ + cp $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \ + done + cp build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk if [ ! -d $(DESTDIR)$(bindir) ]; then \ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \ fi; @@ -119,10 +124,10 @@ delete-exports: fi exports.c: - $(AWK) -f $(top_srcdir)/build/make_exports.awk $(EXPORT_FILES) > $@ + $(APR_MKEXPORT) $(EXPORT_FILES) > $@ export_vars.c: - $(AWK) -f $(top_srcdir)/build/make_var_export.awk $(EXPORT_FILES) > $@ + $(APR_MKVAREXPORT) $(EXPORT_FILES) > $@ apr.exp: exports.c export_vars.c @echo "#! lib@APR_LIBNAME@.so" > $@ |