--- a/Makefile.in	Sun Jul 08 04:07:36 2007 +0000
+++ b/Makefile.in	Sun Jul 08 05:58:16 2007 +0000
@@ -6,11 +6,12 @@
 depend	= build-deps
 prefix = @prefix@
 exec_prefix = @exec_prefix@
-bindir	= $(DESTDIR)@bindir@
-libdir  = $(DESTDIR)@libdir@
-includedir = $(DESTDIR)@includedir@
-datadir	= $(DESTDIR)@datadir@
-mandir	= $(DESTDIR)@mandir@
+bindir	= @bindir@
+libdir  = @libdir@
+includedir = @includedir@
+datarootdir = @datarootdir@
+datadir	= @datadir@
+mandir	= @mandir@
 auxdir	= @ac_aux_dir@
 distpath = $(srcdir)/..
 distdir = SDL-@SDL_VERSION@
@@ -46,7 +47,7 @@
 LT_CURRENT  = @LT_CURRENT@
 LT_RELEASE  = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
-LT_LDFLAGS  = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+LT_LDFLAGS  = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
 
@@ -82,49 +83,49 @@
 
 install: all install-bin install-hdrs install-lib install-data install-man
 install-bin:
-	$(SHELL) $(auxdir)/mkinstalldirs $(bindir)
-	$(INSTALL) -m 755 sdl-config $(bindir)/sdl-config
+	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(bindir)
+	$(INSTALL) -m 755 sdl-config $(DESTDIR)$(bindir)/sdl-config
 install-hdrs:
-	$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL
+	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(includedir)/SDL
 	for file in $(HDRS); do \
-	    $(INSTALL) -m 644 $(srcdir)/include/$$file $(includedir)/SDL/$$file; \
+	    $(INSTALL) -m 644 $(srcdir)/include/$$file $(DESTDIR)$(includedir)/SDL/$$file; \
 	done
-	$(INSTALL) -m 644 include/SDL_config.h $(includedir)/SDL/SDL_config.h
+	$(INSTALL) -m 644 include/SDL_config.h $(DESTDIR)$(includedir)/SDL/SDL_config.h
 install-lib: $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
-	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)
-	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
-	$(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(libdir)/$(SDLMAIN_TARGET)
-	$(RANLIB) $(libdir)/$(SDLMAIN_TARGET)
+	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)
+	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(DESTDIR)$(libdir)/$(TARGET)
+	$(INSTALL) -m 644 $(objects)/$(SDLMAIN_TARGET) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
+	$(RANLIB) $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
 install-data:
-	$(SHELL) $(auxdir)/mkinstalldirs $(datadir)/aclocal
-	$(INSTALL) -m 644 $(srcdir)/sdl.m4 $(datadir)/aclocal/sdl.m4
-	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)/pkgconfig
-	$(INSTALL) -m 644 sdl.pc $(libdir)/pkgconfig
+	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(datadir)/aclocal
+	$(INSTALL) -m 644 $(srcdir)/sdl.m4 $(DESTDIR)$(datadir)/aclocal/sdl.m4
+	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
+	$(INSTALL) -m 644 sdl.pc $(DESTDIR)$(libdir)/pkgconfig
 install-man:
-	$(SHELL) $(auxdir)/mkinstalldirs $(mandir)/man3
+	$(SHELL) $(auxdir)/mkinstalldirs $(DESTDIR)$(mandir)/man3
 	for src in $(srcdir)/docs/man3/*.3; do \
 	    file=`echo $$src | sed -e 's|^.*/||'`; \
-	    $(INSTALL) -m 644 $$src $(mandir)/man3/$$file; \
+	    $(INSTALL) -m 644 $$src $(DESTDIR)$(mandir)/man3/$$file; \
 	done
 
 uninstall: uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man
 uninstall-bin:
-	rm -f $(bindir)/sdl-config
+	rm -f $(DESTDIR)$(bindir)/sdl-config
 uninstall-hdrs:
 	for file in $(HDRS); do \
-	    rm -f $(includedir)/SDL/$$file; \
+	    rm -f $(DESTDIR)$(includedir)/SDL/$$file; \
 	done
-	rm -f $(includedir)/SDL/SDL_config.h
-	-rmdir $(includedir)/SDL
+	rm -f $(DESTDIR)$(includedir)/SDL/SDL_config.h
+	-rmdir $(DESTDIR)$(includedir)/SDL
 uninstall-lib:
-	$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET)
-	rm -f $(libdir)/$(SDLMAIN_TARGET)
+	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(TARGET)
+	rm -f $(DESTDIR)$(libdir)/$(SDLMAIN_TARGET)
 uninstall-data:
-	rm -f $(datadir)/aclocal/sdl.m4
+	rm -f $(DESTDIR)$(datadir)/aclocal/sdl.m4
 uninstall-man:
 	for src in $(srcdir)/docs/man3/*.3; do \
 	    file=`echo $$src | sed -e 's|^.*/||'`; \
-	    rm -f $(mandir)/man3/$$file; \
+	    rm -f $(DESTDIR)$(mandir)/man3/$$file; \
 	done
 
 clean: