jorton 2004/06/30 07:14:31
Modified: . Makefile.in
Log:
* Makefile.in (install, exports.c, export_vars.c): Use new APR_*
macros to pick up awk scripts and mkdir.sh from the installed APR tree
if building against an installed copy of APR.
Revision Changes Path
1.94 +6 -9 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.93
retrieving revision 1.94
diff -d -w -u -r1.93 -r1.94
--- Makefile.in 30 Jun 2004 09:08:16 -0000 1.93
+++ Makefile.in 30 Jun 2004 14:14:31 -0000 1.94
@@ -14,9 +14,6 @@
APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@
APRUTIL_LIBS = @APRUTIL_LIBS@
-# see build/apu-conf.m4 for rationale.
-APR_BUILD_DIR = @APR_SOURCE_DIR@/build
-
TARGET_LIB = [EMAIL PROTECTED]@.la
INSTALL_SUBDIRS = @APR_XML_DIR@
EXTRA_SOURCE_DIRS = @APR_XML_DIR@
@@ -56,7 +53,7 @@
install: $(TARGET_LIB) apu-config.out
if [ ! -d $(DESTDIR)$(includedir) ]; then \
- $(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(includedir); \
+ $(APR_MKDIR) $(DESTDIR)$(includedir); \
fi;
cp -p $(top_srcdir)/include/*.h $(DESTDIR)$(includedir)
@@ -64,10 +61,10 @@
cp -p $(top_blddir)/include/*.h $(DESTDIR)$(includedir); \
fi;
if [ ! -d $(DESTDIR)$(libdir) ]; then \
- $(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(libdir); \
+ $(APR_MKDIR) $(DESTDIR)$(libdir); \
fi;
if [ ! -d $(DESTDIR)$(libdir)/pkgconfig ]; then \
- $(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(libdir)/pkgconfig; \
+ $(APR_MKDIR) $(DESTDIR)$(libdir)/pkgconfig; \
fi;
cp -p apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
@@ -76,7 +73,7 @@
$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir)
$(LIBTOOL) --mode=install cp aprutil.exp $(DESTDIR)$(libdir)
if [ ! -d $(DESTDIR)$(bindir) ]; then \
- $(APR_BUILD_DIR)/mkdir.sh $(DESTDIR)$(bindir); \
+ $(APR_MKDIR) $(DESTDIR)$(bindir); \
fi;
$(LIBTOOL) --mode=install cp apu-config.out
$(DESTDIR)$(bindir)/apu-config
chmod 755 $(DESTDIR)$(bindir)/apu-config
@@ -85,10 +82,10 @@
$(LINK) @lib_target@ $(ALL_LIBS) $(EXTRA_OS_LINK)
exports.c: $(HEADERS)
- $(AWK) -f $(APR_BUILD_DIR)/make_exports.awk $(HEADERS) > $@
+ $(APR_MKEXPORT) $(HEADERS) > $@
export_vars.c: $(HEADERS)
- $(AWK) -f $(APR_BUILD_DIR)/make_var_export.awk $(HEADERS) > $@
+ $(APR_MKVAREXPORT) $(HEADERS) > $@
aprutil.exp: exports.c export_vars.c
@echo "#! libaprutil.so" > $@
