svn commit: r380868 - in /httpd/apreq/branches/apr-build-system: Makefile.in STATUS apreq2-config.in

[jo...@apache.org]

Author: joes
Date: Fri Feb 24 15:42:18 2006
New Revision: 380868

URL: http://svn.apache.org/viewcvs?rev=380868&view=rev
Log:
fix make install

Modified:
    httpd/apreq/branches/apr-build-system/Makefile.in
    httpd/apreq/branches/apr-build-system/STATUS
    httpd/apreq/branches/apr-build-system/apreq2-config.in

Modified: httpd/apreq/branches/apr-build-system/Makefile.in
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/Makefile.in?rev=380868&r1=380867&r2=380868&view=diff
==============================================================================
--- httpd/apreq/branches/apr-build-system/Makefile.in (original)
+++ httpd/apreq/branches/apr-build-system/Makefile.in Fri Feb 24 15:42:18 2006
@@ -18,14 +18,14 @@
 APREQ_LIBS = @APREQ_LIBS@
 
 TARGET_LIB = lib@APREQ_LIBNAME@.la
-INSTALL_SUBDIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
-EXTRA_SOURCE_DIRS = @APR_ICONV_DIR@ @APR_XML_DIR@
+INSTALL_SUBDIRS =
+EXTRA_SOURCE_DIRS =
 APRUTIL_PCFILE = apr-util-$(APRUTIL_MAJOR_VERSION).pc
 APREQ_CONFIG = apreq2-config
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
-TARGETS = $(TARGET_LIB) aprutil.exp
+TARGETS = $(TARGET_LIB) apreq.exp
 
 # bring in rules.mk for standard functionality
 @INCLUDE_RULES@
@@ -33,15 +33,13 @@
 
 LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info $(APREQ_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
 
-CLEAN_SUBDIRS = test @APR_ICONV_DIR@
+CLEAN_SUBDIRS = test
 
-CLEAN_TARGETS = exports.c export_vars.c aprutil.exp .make.dirs apu-config.out
+CLEAN_TARGETS = exports.c export_vars.c apreq.exp .make.dirs apreq2-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 \
-	export_vars.sh $(APU_CONFIG) build/rules.mk include/apu_want.h \
+	export_vars.sh $(APREQ_CONFIG) build/rules.mk \
 	apr-util.pc build/pkg/pkginfo
-EXTRACLEAN_TARGETS = configure aclocal.m4 include/private/apu_config.h.in \
+EXTRACLEAN_TARGETS = configure aclocal.m4 \
 	exports.c build-outputs.mk \
 	build/apr_common.m4 build/find_apr.m4 build/install.sh \
 	build/config.guess build/config.sub
@@ -55,22 +53,22 @@
 top_blddir=@abs_builddir@
 
 # Create apu-config script suitable for the install tree
-apu-config.out: $(APU_CONFIG)
-	sed 's,^\(location=\).*$$,\1installed,' < $(APU_CONFIG) > $@
+apreq2-config.out: $(APREQ_CONFIG)
+	sed 's,^\(location=\).*$$,\1installed,' < $(APREQ_CONFIG) > $@
 
-install: $(TARGET_LIB) apu-config.out
+install: $(TARGET_LIB) apreq2-config.out
 	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
 		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
 	for f in $(top_srcdir)/include/*.h $(top_blddir)/include/*.h; do \
 		$(INSTALL_DATA) $${f} $(DESTDIR)$(includedir); \
 	done
-	$(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
+	echo $(INSTALL_DATA) apr-util.pc $(DESTDIR)$(libdir)/pkgconfig/$(APRUTIL_PCFILE)
 	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
 		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
 	done
 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 $(TARGET_LIB) $(DESTDIR)$(libdir)
-	$(INSTALL_DATA) aprutil.exp $(DESTDIR)$(libdir)
-	$(INSTALL) -m 755 apu-config.out $(DESTDIR)$(bindir)/$(APU_CONFIG)
+	$(INSTALL_DATA) apreq.exp $(DESTDIR)$(libdir)
+	$(INSTALL) -m 755 apreq2-config.out $(DESTDIR)$(bindir)/$(APREQ_CONFIG)
 
 $(TARGET_LIB): $(OBJECTS)
 	$(LINK) @lib_target@ $(ALL_LIBS) $(APREQ_LDFLAGS) $(APREQ_LIBS)
@@ -81,8 +79,8 @@
 export_vars.c: $(HEADERS)
 	$(APR_MKVAREXPORT) $(HEADERS) > $@
 
-aprutil.exp: exports.c export_vars.c
-	@echo "#! lib@APRUTIL_LIBNAME@.so" > $@
+apreq.exp: exports.c export_vars.c
+	@echo "#! lib@APREQ_LIBNAME@.so" > $@
 	@echo "* This file was AUTOGENERATED at build time." >> $@
 	@echo "* Please do not edit by hand." >> $@
 	$(CPP) $(ALL_CPPFLAGS) $(ALL_INCLUDES) exports.c | grep "ap_hack_" | sed -e 's/^.*[)]\(.*\);$$/\1/' >> $@

Modified: httpd/apreq/branches/apr-build-system/STATUS
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/STATUS?rev=380868&r1=380867&r2=380868&view=diff
==============================================================================
--- httpd/apreq/branches/apr-build-system/STATUS (original)
+++ httpd/apreq/branches/apr-build-system/STATUS Fri Feb 24 15:42:18 2006
@@ -19,8 +19,7 @@
 
 TODO:
 
-      make install  doesn't work.
-      apreq2-config isn't even included.
+      apreq2-config doesn't install correctly.
       mod_apreq2    doesn't even build.
 
 

Modified: httpd/apreq/branches/apr-build-system/apreq2-config.in
URL: http://svn.apache.org/viewcvs/httpd/apreq/branches/apr-build-system/apreq2-config.in?rev=380868&r1=380867&r2=380868&view=diff
==============================================================================
--- httpd/apreq/branches/apr-build-system/apreq2-config.in (original)
+++ httpd/apreq/branches/apr-build-system/apreq2-config.in Fri Feb 24 15:42:18 2006
@@ -26,9 +26,9 @@
 libdir="@libdir@"
 includedir="@includedir@"
 
-LIBS="@APR_LIBS@ @APU_LIBS@"
-LDFLAGS="@LDFLAGS@"
-INCLUDES="@APR_INCLUDES@"
+LIBS="@APREQ_LIBS@"
+LDFLAGS="@APREQ_LDFLAGS@"
+INCLUDES="@APREQ_INCLUDES@"
 
 APREQ_LIBNAME="@APREQ_LIBNAME@"