diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-02-01 16:42:44 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-02-01 16:42:44 +0000 |
| commit | 0330485c8c24e3ffc407027ebc062dd90b3531ec (patch) | |
| tree | eaacdb095730300ceaffbeacbfe4ba34b3e4de63 /Makefile.in | |
| parent | f8563884c0c8adf8eeac9d02bd8aae6a66b240a8 (diff) | |
| download | libapr-0330485c8c24e3ffc407027ebc062dd90b3531ec.tar.gz | |
Remove "location detection" from apr-config:
* configure.in: Substitute APR_CONFIG_LOCATION as "build" or "source"
appropriately.
* apr-config.in: Set location to @APR_CONFIG_LOCATION@ rather than
fragile pwd/realpath guesswork; pick up and use APR_BUILD_DIR instead
of $thisdir.
* Makefile.in (apr-config.out): New target.
(install): Install apr-config.out instead of apr-config.
PR: 8867
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@64888 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index f69845ce1..7f36d2988 100644 --- a/Makefile.in +++ b/Makefile.in @@ -31,7 +31,7 @@ TARGETS = delete-lib $(TARGET_LIB) delete-exports export_vars.h apr.exp # bring in rules.mk for standard functionality @INCLUDE_RULES@ -CLEAN_TARGETS = +CLEAN_TARGETS = apr-config.out DISTCLEAN_TARGETS = config.cache config.log config.status \ include/apr.h include/arch/unix/apr_private.h \ libtool apr.exp apr-config exports.c export_vars.h @@ -60,7 +60,11 @@ delete-lib: fi \ fi -install: $(TARGET_LIB) +# Create apr-config script suitable for the install tree +apr-config.out: apr-config + sed 's,^\(location=\).*$$,\1installed,' < apr-config > $@ + +install: $(TARGET_LIB) apr-config.out if [ ! -d $(DESTDIR)$(includedir) ]; then \ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(includedir); \ fi; @@ -90,7 +94,7 @@ install: $(TARGET_LIB) if [ ! -d $(DESTDIR)$(bindir) ]; then \ $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \ fi; - $(LIBTOOL) --mode=install cp apr-config $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install cp apr-config.out $(DESTDIR)$(bindir)/apr-config chmod 755 $(DESTDIR)$(bindir)/apr-config @if [ $(INSTALL_SUBDIRS) != "none" ]; then \ for i in $(INSTALL_SUBDIRS); do \ |