diff options
| author | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-06-14 15:43:40 +0000 |
|---|---|---|
| committer | jorton <jorton@13f79535-47bb-0310-9956-ffa450edef68> | 2004-06-14 15:43:40 +0000 |
| commit | 638d6b7278e9bd1151fef691455799df2c3f8f78 (patch) | |
| tree | 39bc1872f78ed6701f4fcb09663c18fcd8ef550c /Makefile.in | |
| parent | 7100d1bf3c4a679c1a8d5fbba33831045ab8cd42 (diff) | |
| download | libapr-util-638d6b7278e9bd1151fef691455799df2c3f8f78.tar.gz | |
Remove "location detection" from apu-config:
* configure.in: Substitute APU_CONFIG_LOCATION as "build" or "source"
appropriately.
* apu-config.in: Set location to @APU_CONFIG_LOCATION@ rather than
using fragile pwd/realpath guesswork.
* Makefile.in (apu-config.out): New target.
(install): Install apu-config.out instead of apu-config.
PR: 8867 (episode two)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@59052 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 439702d5..e5945f2a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,7 +27,7 @@ TARGETS = $(TARGET_LIB) aprutil.exp export_vars.h CLEAN_SUBDIRS = test -CLEAN_TARGETS = exports.c export_vars.h aprutil.exp .make.dirs +CLEAN_TARGETS = exports.c export_vars.h aprutil.exp .make.dirs apu-config.out DISTCLEAN_TARGETS = config.cache config.log config.status libtool \ include/private/apu_config.h include/private/apu_private.h \ include/private/apu_select_dbm.h include/apr_ldap.h include/apu.h \ @@ -46,8 +46,11 @@ includedir=@includedir@ top_srcdir=@abs_srcdir@ top_blddir=@abs_builddir@ +# Create apu-config script suitable for the install tree +apu-config.out: apu-config + sed 's,^\(location=\).*$$,\1installed,' < apu-config > $@ -install: $(TARGET_LIB) +install: $(TARGET_LIB) apu-config.out if [ ! -d $(DESTDIR)$(includedir) ]; then \ @APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(includedir); \ fi; @@ -71,7 +74,7 @@ install: $(TARGET_LIB) if [ ! -d $(DESTDIR)$(bindir) ]; then \ @APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(bindir); \ fi; - $(LIBTOOL) --mode=install cp apu-config $(DESTDIR)$(bindir) + $(LIBTOOL) --mode=install cp apu-config.out $(DESTDIR)$(bindir)/apu-config chmod 755 $(DESTDIR)$(bindir)/apu-config $(TARGET_LIB): $(OBJECTS) |