Index: configure.in
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/configure.in,v
retrieving revision 1.19
diff -u -r1.19 configure.in
--- configure.in	31 Aug 2002 19:43:27 -0000	1.19
+++ configure.in	2 Sep 2002 12:59:34 -0000
@@ -75,6 +75,14 @@
 dnl   *)   AC_MSG_ERROR(bad value ${enableval} for man-doc option) ;;
 dnl  esac], [man_doc=yes])dnl
 
+AC_ARG_ENABLE(versioned-doc,
+[  --enable-versioned-doc  install docs in directory with version name (default)],
+[case "${enableval}" in
+  yes) versioned_doc=yes ;;
+  no)  versioned_doc=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for versioned-doc option) ;;
+ esac], [versioned_doc=yes])dnl
+
 if test "${target}" = "NONE"; then
    target=avr
 fi
@@ -185,6 +193,14 @@
 ])dnl
 
 CHECK_DOXYGEN
+
+if test "$versioned_doc" = "yes"; then
+	DOC_INST_DIR='$(DESTDIR)$(datadir)/doc/avr-libc-$(VERSION)'
+else
+	DOC_INST_DIR='$(DESTDIR)$(datadir)/doc/avr-libc'
+fi
+
+AC_SUBST(DOC_INST_DIR)
 
 dnl we need to set some compiler switches according to the current
 dnl avr library configuration
Index: doc/api/Makefile.am
===================================================================
RCS file: /home/cvs/avr-libc/avr-libc/doc/api/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- doc/api/Makefile.am	30 Aug 2002 17:10:17 -0000	1.16
+++ doc/api/Makefile.am	2 Sep 2002 12:59:35 -0000
@@ -46,7 +46,7 @@
 
 SUFFIXES             = .pdf
 
-DOC_INST_DIR         = $(DESTDIR)$(datadir)/doc/avr-libc-$(VERSION)
+DOC_INST_DIR         = @DOC_INST_DIR@
 
 USER_MANUAL          = @AVR_LIBC_USER_MANUAL@