gstein      01/01/04 12:07:55

  Modified:    .        Makefile.in configure.in
               build    Makefile.in
               src      Makefile.in
               src/buckets Makefile.in
               src/crypto Makefile.in
               src/dbm  Makefile.in
               src/dbm/sdbm Makefile.in
               src/encoding Makefile.in
               src/hooks Makefile.in
               src/uri  Makefile.in
               src/xml  Makefile.in
               test     Makefile.in
  Log:
  use the '.include ".../rules.mk"' makefile syntax for the BSDi platform.
  
  Revision  Changes    Path
  1.11      +1 -1      apr-util/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- Makefile.in	2000/12/21 01:06:34	1.10
  +++ Makefile.in	2001/01/04 20:07:31	1.11
  @@ -8,7 +8,7 @@
   TARGETS = delete-lib $(TARGET_LIB) delete-exports $(TARGET_EXPORTS)
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
   
   SUBDIRS = src . build
   
  
  
  
  1.7       +13 -0     apr-util/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr-util/configure.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- configure.in	2000/12/21 18:39:01	1.6
  +++ configure.in	2001/01/04 20:07:31	1.7
  @@ -55,6 +55,19 @@
   AC_SUBST(APRUTIL_EXPORT_LIBS)
   
   dnl
  +dnl BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
  +dnl
  +case "$host_alias" in
  +*bsdi*)
  +    INCLUDE_RULES='.include "$(top_builddir)/build/rules.mk"'
  +    ;;
  +*)
  +    INCLUDE_RULES='include $(top_builddir)/build/rules.mk'
  +    ;;
  +esac
  +AC_SUBST(INCLUDE_RULES)
  +
  +dnl
   dnl everthing is done. 
   AC_OUTPUT([
   	Makefile
  
  
  
  1.2       +1 -1      apr-util/build/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/build/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- Makefile.in	2000/12/02 16:13:47	1.1
  +++ Makefile.in	2001/01/04 20:07:34	1.2
  @@ -1,5 +1,5 @@
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
   
   EXTRACLEAN_TARGETS = config.guess config.sub ltconfig ltmain.sh rules.mk
  
  
  
  1.2       +1 -1      apr-util/src/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- Makefile.in	2000/12/02 16:13:47	1.1
  +++ Makefile.in	2001/01/04 20:07:37	1.2
  @@ -1,5 +1,5 @@
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
   
   SUBDIRS = buckets crypto dbm encoding hooks uri xml
  
  
  
  1.7       +1 -1      apr-util/src/buckets/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/buckets/Makefile.in,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- Makefile.in	2000/12/22 00:18:40	1.6
  +++ Makefile.in	2001/01/04 20:07:40	1.7
  @@ -4,4 +4,4 @@
   ap_buckets_mmap.lo ap_buckets_socket.lo ap_buckets_eos.lo ap_buckets_pipe.lo
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
  
  
  
  1.3       +1 -1      apr-util/src/crypto/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/crypto/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- Makefile.in	2000/12/05 20:21:20	1.2
  +++ Makefile.in	2001/01/04 20:07:42	1.3
  @@ -2,4 +2,4 @@
   TARGETS = ap_sha1.lo
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
  
  
  
  1.3       +1 -1      apr-util/src/dbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/dbm/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- Makefile.in	2000/12/06 02:19:50	1.2
  +++ Makefile.in	2001/01/04 20:07:44	1.3
  @@ -1,6 +1,6 @@
   TARGETS = apr_dbm.lo
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
   
   SUBDIRS = sdbm .
  
  
  
  1.2       +1 -1      apr-util/src/dbm/sdbm/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/dbm/sdbm/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- Makefile.in	2000/12/02 16:13:49	1.1
  +++ Makefile.in	2001/01/04 20:07:45	1.2
  @@ -2,4 +2,4 @@
   TARGETS = sdbm.lo sdbm_hash.lo sdbm_lock.lo sdbm_pair.lo
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
  
  
  
  1.4       +1 -1      apr-util/src/encoding/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/encoding/Makefile.in,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -u -r1.3 -r1.4
  --- Makefile.in	2000/12/05 20:21:22	1.3
  +++ Makefile.in	2001/01/04 20:07:48	1.4
  @@ -2,4 +2,4 @@
   TARGETS = ap_base64.lo
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
  
  
  
  1.3       +1 -1      apr-util/src/hooks/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/hooks/Makefile.in,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -u -r1.2 -r1.3
  --- Makefile.in	2000/12/05 02:19:38	1.2
  +++ Makefile.in	2001/01/04 20:07:49	1.3
  @@ -2,4 +2,4 @@
   TARGETS = ap_hooks.lo
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
  
  
  
  1.2       +1 -1      apr-util/src/uri/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/uri/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- Makefile.in	2000/12/02 16:13:50	1.1
  +++ Makefile.in	2001/01/04 20:07:51	1.2
  @@ -1,3 +1,3 @@
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
  
  
  
  1.2       +1 -1      apr-util/src/xml/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/src/xml/Makefile.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- Makefile.in	2000/12/02 16:13:50	1.1
  +++ Makefile.in	2001/01/04 20:07:52	1.2
  @@ -1,3 +1,3 @@
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
  
  
  
  1.5       +1 -1      apr-util/test/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr-util/test/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- Makefile.in	2000/12/09 09:07:14	1.4
  +++ Makefile.in	2001/01/04 20:07:53	1.5
  @@ -2,7 +2,7 @@
   PROGRAMS = testdbm
   
   top_builddir = @top_builddir@
  -include $(top_builddir)/build/rules.mk
  +@INCLUDE_RULES@
   
   test: $(PROGRAMS)