--- a/Makefile.in	Mon Feb 20 11:49:16 2006 +0000
+++ b/Makefile.in	Mon Feb 20 12:45:51 2006 +0000
@@ -11,6 +11,7 @@
 includedir = $(DESTDIR)@includedir@
 datadir	= $(DESTDIR)@datadir@
 mandir	= $(DESTDIR)@mandir@
+auxdir	= @ac_aux_dir@
 distpath = $(srcdir)/..
 distdir = SDL-@SDL_VERSION@
 distfile = $(distdir).tar.gz
@@ -31,11 +32,6 @@
 
 DIST = acinclude.m4 autogen.sh Borland.html Borland.zip BUGS build-scripts configure configure.in COPYING CREDITS CWprojects.sea.bin docs docs.html EpocBuildFiles.zip include INSTALL Makefile.dc Makefile.in MPWmake.sea.bin PBProjects.tar.gz README* sdl-config.in sdl.m4 SDL.qpg.in SDL.spec SDL.spec.in setvars.cmd src test TODO VisualCE.zip VisualC.html VisualC.zip Watcom.mif WhatsNew Xcode21.tar.gz Xcode.tar.gz XcodeUniversal.tar.gz
 
-BUILDC	= $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'`  -o $@
-BUILDCC	= $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'`  -o $@
-BUILDM	= $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c `echo $? | sed 's| .*||'`  -o $@
-BUILDASM = $(LIBTOOL) --tag=CC --mode=compile @ac_aux_dir@/strip_fPIC.sh $(NASM) `echo $? | sed 's| .*||'` -o $@
-
 LT_AGE      = @LT_AGE@
 LT_CURRENT  = @LT_CURRENT@
 LT_RELEASE  = @LT_RELEASE@
@@ -48,12 +44,12 @@
 	$(SHELL) config.status $@
 
 $(objects):
-	$(SHELL) @ac_aux_dir@/mkinstalldirs $@
+	$(SHELL) $(auxdir)/mkinstalldirs $@
 
 .PHONY: all depend install install-bin install-hdrs install-lib install-data install-man uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data uninstall-man clean distclean dist
 depend:
 	SOURCES="$(SOURCES)" INCLUDE="$(INCLUDE)" objects="$(objects)" output="$(depend)" \
-	$(SHELL) @ac_aux_dir@/makedep.sh
+	$(SHELL) $(auxdir)/makedep.sh
 
 include $(depend)
 
@@ -62,23 +58,23 @@
 
 install: install-bin install-hdrs install-lib install-data install-man
 install-bin:
-	$(SHELL) @ac_aux_dir@/mkinstalldirs $(bindir)
+	$(SHELL) $(auxdir)/mkinstalldirs $(bindir)
 	$(INSTALL) -m 755 $(srcdir)/sdl-config $(bindir)/sdl-config
 install-hdrs:
-	$(SHELL) @ac_aux_dir@/mkinstalldirs $(includedir)/SDL
+	$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL
 	for src in $(srcdir)/include/*.h; do \
 	    file=`echo $$src | sed -e 's|^.*/||'`; \
 	    $(INSTALL) $$src $(includedir)/SDL/$$file; \
 	done
 	$(INSTALL) include/SDL_config.h $(includedir)/SDL/SDL_config.h
 install-lib:
-	$(SHELL) @ac_aux_dir@/mkinstalldirs $(libdir)
+	$(SHELL) $(auxdir)/mkinstalldirs $(libdir)
 	$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
 install-data:
-	$(SHELL) @ac_aux_dir@/mkinstalldirs $(datadir)/aclocal
+	$(SHELL) $(auxdir)/mkinstalldirs $(datadir)/aclocal
 	$(INSTALL) $(srcdir)/sdl.m4 $(datadir)/aclocal/sdl.m4
 install-man:
-	$(SHELL) @ac_aux_dir@/mkinstalldirs $(mandir)/man3
+	$(SHELL) $(auxdir)/mkinstalldirs $(mandir)/man3
 	for src in $(srcdir)/docs/man3/*.3; do \
 	    file=`echo $$src | sed -e 's|^.*/||'`; \
 	    $(INSTALL) $$src $(mandir)/man3/$$file; \
@@ -120,7 +116,7 @@
 	if test -f test/Makefile; then (cd test; $(MAKE) $@); fi
 
 dist $(distfile):
-	$(SHELL) @ac_aux_dir@/mkinstalldirs $(distdir)
+	$(SHELL) $(auxdir)/mkinstalldirs $(distdir)
 	tar cf - $(DIST) | (cd $(distdir); tar xf -)
 	rm -rf `find $(distdir) -name CVS`
 	rm -f `find $(distdir) -name '.cvsignore'`