2002-07-31  Theodore A. Roth  <address@hidden>

	* Makefile.am: Make doc subdir conditional.
	* configure.in: Fix so docs are only built once.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- Makefile.am	16 Jul 2002 20:11:37 -0000	1.3
+++ Makefile.am	1 Aug 2002 06:05:17 -0000
@@ -72,7 +72,8 @@
 
 FLAGS_TO_PASS = $(AM_MAKEFLAGS)
 
-SUBDIRS = crt1 libc libm doc
+SUBDIRS = crt1 libc libm @DOCSDIR@
+DIST_SUBDIRS = crt1 libc libm doc
 
 tooldir = $(exec_prefix)/$(host_alias)
 toollibdir = $(tooldir)/lib$(MULTISUBDIR)
Index: configure.in
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/configure.in,v
retrieving revision 1.5
diff -u -r1.5 configure.in
--- configure.in	16 Jul 2002 20:11:37 -0000	1.5
+++ configure.in	1 Aug 2002 06:05:17 -0000
@@ -169,6 +169,7 @@
 AVR_CRT_OTHER=''
 avrlib_cflags=''
 avrlib_asflags=''
+DOCSDIR=''
 if test -z "${with_multisubdir}"; then
   dnl default build directory -> avr1 and avr2
   avrlib_cflags="-mmcu=avr2 ${avrlib_opt_space}"
@@ -177,6 +178,9 @@
                 crts4414.o crts4433.o crts4434.o crts8515.o crts8535.o \\\
                 crtc8534.o'
   AVR_CRT_TINY='crttn11.o crttn12.o crttn15.o crttn28.o crttn22.o # crttn26.o'
+
+  dnl We only want to build the docs for the default caes
+  DOCSDIR='doc'
 else
   case $with_multisubdir in
   avr3) avrlib_cflags=${avrlib_opt_speed}
@@ -211,6 +215,8 @@
 dnl the includes for the avr libc
 INCLUDES='-I$(top_srcdir)/include -I$(top_srcdir)/common'
 AC_SUBST(INCLUDES)
+
+AC_SUBST(DOCSDIR)
 
 if test "${multilib}" = "yes"; then
   multilib_arg="--enable-multilib"