diff -r cd97a8e39874 -r 64710b9f3eeb Makefile.in
--- a/Makefile.in	Thu Mar 23 17:31:12 2006 +0000
+++ b/Makefile.in	Thu Mar 23 21:28:33 2006 +0000
@@ -99,7 +99,7 @@
 	    $(INSTALL) -m 644 $$src $(mandir)/man3/$$file; \
 	done
 
-uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-man
+uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man
 uninstall-bin:
 	rm -f $(bindir)/sdl-config
 uninstall-hdrs:
@@ -108,6 +108,7 @@
 	    rm -f $(includedir)/SDL/$$file; \
 	done
 	rm -f $(includedir)/SDL/SDL_config.h
+	-rmdir $(includedir)/SDL
 uninstall-lib:
 	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET)
 	rm -f $(libdir)/$(SDLMAIN_TARGET)
@@ -125,19 +126,25 @@
 
 distclean: clean
 	rm -f Makefile include/SDL_config.h sdl-config
+	rm -f include/SDL_config.h sdl-config
 	rm -f SDL.qpg
 	rm -f config.status config.cache config.log libtool $(depend)
 	rm -rf $(srcdir)/autom4te*
-	find $(srcdir) \
-	    -name '*~' -o -name '*.bak' -o -name '*.old' -o -name '*.rej' -o \
-	    -name '.#*' \
+	find $(srcdir) \( \
+	    -name '*~' -o \
+	    -name '*.bak' -o \
+	    -name '*.old' -o \
+	    -name '*.rej' -o \
+	    -name '*.orig' -o \
+	    -name '.#*' \) \
 	    -exec rm -f {} \;
-	cp $(srcdir)/include/SDL_config.h.minimal $(srcdir)/include/SDL_config.h
+	cp $(srcdir)/include/SDL_config.h.default $(srcdir)/include/SDL_config.h
 	if test -f test/Makefile; then (cd test; $(MAKE) $@); fi
 
 dist $(distfile):
 	$(SHELL) $(auxdir)/mkinstalldirs $(distdir)
 	tar cf - $(DIST) | (cd $(distdir); tar xf -)
+	cp $(distdir)/include/SDL_config.h.default $(distdir)/include/SDL_config.h
 	rm -rf `find $(distdir) -name CVS`
 	rm -f `find $(distdir) -name '.cvsignore'`
 	rm -f `find $(distdir) -name '.#*'`
@@ -154,6 +161,7 @@
 	cvs -d $(CVSROOT) login
 	cvs -d $(CVSROOT) checkout -P SDL12
 	(cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
+	cp SDL12/include/SDL_config.h.default SDL12/include/SDL_config.h
 	mv SDL12 SDL-1.2
 	tar zcf $(HOME)/SDL-1.2.tar.gz SDL-1.2
 	rm -f $(HOME)/SDL-1.2.zip