2005-01-01  Joerg Wunsch <address@hidden>

	* Makefile.am (install-data-local uninstall-local):
	Do also install .../include/compat.  While being here, repair
	uninstalling the entire world as well.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/Makefile.am,v
retrieving revision 1.12
diff -u -u -r1.12 Makefile.am
--- Makefile.am	1 Jan 2005 20:11:50 -0000	1.12
+++ Makefile.am	1 Jan 2005 21:11:34 -0000
@@ -136,17 +136,29 @@
 
 crt1/crt%.o: ; @true
 
+INCLUDEDIRS="" /avr /compat
+
 install-data-local:	install-toollibLIBRARIES
 	$(MULTIDO) $(AM_MAKEFLAGS) DO=install multi-do
 	-if [ -z "$(MULTISUBDIR)" ]; then \
-	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include; \
-	  for i in $(srcdir)/include/*.h; do \
-	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/`basename $$i`; \
+	  for dir in $(INCLUDEDIRS); do \
+	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include$${dir}; \
+	    for i in $(srcdir)/include$${dir}/*.h; do \
+	     $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include$${dir}/`basename $$i`; \
+	    done; \
 	  done; \
-	  $(mkinstalldirs) $(DESTDIR)$(tooldir)/include/avr; \
-	  for i in $(srcdir)/include/avr/*.h; do \
-	   $(INSTALL_DATA) $$i $(DESTDIR)$(tooldir)/include/avr/`basename $$i`; \
+	else true; fi
+
+uninstall-local:	uninstall-toollibLIBRARIES
+	$(MULTIDO) $(AM_MAKEFLAGS) DO=uninstall multi-do
+	-if [ -z "$(MULTISUBDIR)" ]; then \
+	  for dir in $(INCLUDEDIRS); do \
+	    for i in $(DESTDIR)$(tooldir)/include$${dir}/*.h; do \
+	     rm -f $$i; \
+	    done; \
+	    rmdir $(DESTDIR)$(tooldir)/include$${dir} 2>/dev/null; \
 	  done; \
+	  rmdir $(DESTDIR)$(tooldir)/include 2>/dev/null; \
 	else true; fi
 
 # Multilib support.