jorton 2004/08/20 09:42:16
Modified: . Makefile.in
Log:
* Makefile.in (install): Simplify; use INSTALL and INSTALL_DATA rather
than cp; use APR_MKDIR.
Revision Changes Path
1.108 +17 -34 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.107
retrieving revision 1.108
diff -d -w -u -r1.107 -r1.108
--- Makefile.in 1 Aug 2004 00:52:20 -0000 1.107
+++ Makefile.in 20 Aug 2004 16:42:16 -0000 1.108
@@ -29,6 +29,8 @@
TARGET_LIB = [EMAIL PROTECTED]@.la
APR_PCFILE = apr-$(APR_MAJOR_VERSION).pc
APR_CONFIG = apr-$(APR_MAJOR_VERSION)-config
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
#
# Rules for building specific targets, starting with 'all' for
@@ -64,41 +66,22 @@
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;
- cp -p $(top_srcdir)/include/*.h $(DESTDIR)$(includedir);
-
- if test -n "$(top_blddir)"; then \
- cp -p $(top_blddir)/include/*.h $(DESTDIR)$(includedir); \
- fi;
- if [ ! -d $(DESTDIR)$(libdir) ]; then \
- $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(libdir); \
- fi;
- $(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir)
- $(LIBTOOL) --mode=install cp apr.exp $(DESTDIR)$(libdir)
- if [ ! -d $(DESTDIR)$(libdir)/pkgconfig ]; then \
- $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(libdir)/pkgconfig; \
- fi;
- cp -p apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
- if [ ! -d $(DESTDIR)$(installbuilddir) ]; then \
- $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(installbuilddir); \
- fi;
- if [ -f libtool ]; then \
- $(LIBTOOL) --mode=install cp libtool
$(DESTDIR)$(installbuilddir); \
- fi;
- if [ -f shlibtool ]; then \
- $(LIBTOOL) --mode=install cp shlibtool
$(DESTDIR)$(installbuilddir); \
- fi
- for f in mkdir.sh make_exports.awk make_var_export.awk; do \
- cp $(top_srcdir)/build/$${f} $(DESTDIR)$(installbuilddir); \
+ $(APR_MKDIR) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
$(DESTDIR)$(installbuilddir) \
+ $(DESTDIR)$(libdir)/pkgconfig $(DESTDIR)$(includedir)
+ $(INSTALL_DATA) $(top_blddir)/include/apr.h $(DESTDIR)$(includedir)
+ $(INSTALL_DATA) $(top_srcdir)/include/apr_*.h $(DESTDIR)$(includedir)
+ $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB)
$(DESTDIR)$(libdir)
+ $(INSTALL_DATA) apr.exp $(DESTDIR)$(libdir)/apr.exp
+ $(INSTALL_DATA) apr.pc $(DESTDIR)$(libdir)/pkgconfig/$(APR_PCFILE)
+ for f in libtool shlibtool; do \
+ if test -f $${f}; then $(INSTALL) -m 755 $${f}
$(DESTDIR)$(installbuilddir); fi; \
done
- cp build/apr_rules.out $(DESTDIR)$(installbuilddir)/apr_rules.mk
- if [ ! -d $(DESTDIR)$(bindir) ]; then \
- $(top_srcdir)/build/mkdir.sh $(DESTDIR)$(bindir); \
- fi;
- $(LIBTOOL) --mode=install cp apr-config.out
$(DESTDIR)$(bindir)/$(APR_CONFIG)
- chmod 755 $(DESTDIR)$(bindir)/$(APR_CONFIG)
+ $(INSTALL) -m 755 build/mkdir.sh $(DESTDIR)$(installbuilddir)
+ for f in make_exports.awk make_var_export.awk; do \
+ $(INSTALL_DATA) $(top_srcdir)/build/$${f}
$(DESTDIR)$(installbuilddir); \
+ done
+ $(INSTALL_DATA) build/apr_rules.out
$(DESTDIR)$(installbuilddir)/apr_rules.mk
+ $(INSTALL) -m 755 apr-config.out $(DESTDIR)$(bindir)/$(APR_CONFIG)
@if [ $(INSTALL_SUBDIRS) != "none" ]; then \
for i in $(INSTALL_SUBDIRS); do \
( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
