summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2004-06-30 09:08:16 +0000
committerjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2004-06-30 09:08:16 +0000
commitc5bdb1614999ea645ed83694dbcda11954891d16 (patch)
tree47d15564ed1f1f79d0fbf9d3fcbfc39fb6248f4c
parent6e73c9681d0ff737618bf31fa78a8ed96106c5ad (diff)
downloadlibapr-util-c5bdb1614999ea645ed83694dbcda11954891d16.tar.gz
* Makefile.in (install): Simplify stupid over-engineering.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@59082 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--Makefile.in11
1 files changed, 3 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index b390ad29..13dd5ca6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -31,8 +31,7 @@ TARGETS = $(TARGET_LIB) aprutil.exp
CLEAN_SUBDIRS = test
-CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out \
- $(APRUTIL_PCFILE)
+CLEAN_TARGETS = exports.c export_vars.c 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 \
@@ -55,11 +54,7 @@ top_blddir=@abs_builddir@
apu-config.out: apu-config
sed 's,^\(location=\).*$$,\1installed,' < apu-config > $@
-$(APRUTIL_PCFILE): apr-util.pc
- @rm -f $@
- cp apr-util.pc $@
-
-install: $(TARGET_LIB) apu-config.out $(APRUTIL_PCFILE)
+install: $(TARGET_LIB) apu-config.out
if [ ! -d $(DESTDIR)$(includedir) ]; then \
$(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(includedir); \
fi;
@@ -74,7 +69,7 @@ install: $(TARGET_LIB) apu-config.out $(APRUTIL_PCFILE)
if [ ! -d $(DESTDIR)$(libdir)/pkgconfig ]; then \
$(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(libdir)/pkgconfig; \
fi;
- cp -p $(APRUTIL_PCFILE) $(DESTDIR)$(libdir)/pkgconfig
+ cp -p apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
done