diff options
| author | Joe Orton <jorton@apache.org> | 2004-06-30 14:06:21 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2004-06-30 14:06:21 +0000 |
| commit | 505deb611395b7e2a61e30d404e76bbd43ff9f80 (patch) | |
| tree | bfd52d4d928c66e58598b5ffe8b816f19f569107 /Makefile.in | |
| parent | 86384c051abbea7713b6c1755c457ed260fc8f02 (diff) | |
| download | apr-505deb611395b7e2a61e30d404e76bbd43ff9f80.tar.gz | |
* build/apr_rules.mk.in: Define APR_MKEXPORT and APR_MKVAREXPORT to
point at each of the awk scripts (MKEXPORT wasn't used and pointed
at the wrong filename).
* Makefile.in (install): Make the installed apr_rules.mk point at the
installed libtool and AWK scripts.
(exports.c, export_vars.c): Use new APR_*EXPORT macros.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@65249 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index defaa2f10..b059611cc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -39,7 +39,8 @@ TARGETS = $(TARGET_LIB) export_vars.c apr.exp @INCLUDE_RULES@ @INCLUDE_OUTPUTS@ -CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs +CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \ + build/apr_rules.out DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ libtool apr-config build/apr_rules.mk apr.pc @@ -57,7 +58,11 @@ installbuilddir=@installbuilddir@ 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; @@ -84,9 +89,10 @@ install: $(TARGET_LIB) apr-config.out if [ -f shlibtool ]; then \ $(LIBTOOL) --mode=install cp shlibtool $(DESTDIR)$(installbuilddir); \ fi - for f in mkdir.sh make_exports.awk make_var_export.awk apr_rules.mk; do \ + for f in mkdir.sh make_exports.awk make_var_export.awk; do \ test -f build/$${f} && cp 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; @@ -102,10 +108,10 @@ $(TARGET_LIB): $(OBJECTS) $(LINK) @lib_target@ $(ALL_LIBS) exports.c: $(HEADERS) - $(AWK) -f $(top_srcdir)/build/make_exports.awk $(HEADERS) > $@ + $(APR_MKEXPORT) $(HEADERS) > $@ export_vars.c: $(HEADERS) - $(AWK) -f $(top_srcdir)/build/make_var_export.awk $(HEADERS) > $@ + $(APR_MKVAREXPORT) $(HEADERS) > $@ apr.exp: exports.c export_vars.c @echo "#! lib@APR_LIBNAME@.so" > $@ |