You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/06/30 11:08:16 UTC
cvs commit: apr-util Makefile.in
jorton 2004/06/30 02:08:16
Modified: . Makefile.in
Log:
* Makefile.in (install): Simplify stupid over-engineering.
Revision Changes Path
1.93 +3 -8 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.92
retrieving revision 1.93
diff -d -w -u -r1.92 -r1.93
--- Makefile.in 30 Jun 2004 09:05:19 -0000 1.92
+++ Makefile.in 30 Jun 2004 09:08:16 -0000 1.93
@@ -31,8 +31,7 @@
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 @@
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 @@
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