diff -ur saods9/Makefile saods9.new/Makefile
--- saods9/Makefile	2009-09-17 18:41:08.000000000 +0200
+++ saods9.new/Makefile	2010-03-30 12:07:08.000000000 +0200
@@ -176,15 +176,13 @@
 #--------------------------build
 all	: build
 
-build : dirs \
-	tcl tk \
-	tktable tcllib tkcon xmlrpc blt \
-	zlib tclxml tkimg tkmpeg html \
-	xpa iis checkdns $(SIGNAL) funtools \
-	sla ast wcssubs \
+build : dirs xmlrpc \
+	tclxml tkmpeg html \
+	iis checkdns $(SIGNAL) \
+	sla ast  \
 	rice hcompress plio \
 	$(OPTDIR) \
-	saotk zip zvfs ds9
+	saotk ds9
 
 doc	: FORCE
 	@echo "Making Documentation..."
@@ -284,7 +282,7 @@
 
 tclxml	: FORCE
 	@echo "Installing TCLXML..."
-	cd $(TCLXMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --disable-shared --disable-threads --with-xml-static=1 $(TCLXMLFLAGS)
+	cd $(TCLXMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --exec-prefix $(root) --disable-shared --disable-threads --with-xml-static=1 $(TCLXMLFLAGS)
 	cd $(TCLXMLDIR); $(MAKE); $(MAKE) install
 
 tkimg	: FORCE
@@ -299,7 +297,7 @@
 
 html	: FORCE
 	@echo "Installing HTMLWIDGET..."
-	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(root)/$(TCLDIR) --with-tk=$(root)/$(TKDIR) $(XFLAGS) --enable-shared=no
+	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) --with-tcl=$(LIBDIR) $(XFLAGS) --enable-shared=no
 	cd $(HTMLDIR); $(MAKE)
 	cp $(HTMLDIR)/libtkhtml.a lib/.
 
@@ -383,14 +381,12 @@
 scrub : FORCE
 	find . -name "*[~#]" -exec rm {} \;
 
-distclean : tclclean tkclean \
-	tktableclean tcllibclean bltclean \
-	zlibclean tclxmlclean tkimgclean tkmpegclean htmlclean \
-	xpaclean iisclean checkdnsclean $(SIGNALCLEAN) funtoolsclean \
-	slaclean astclean wcssubsclean \
+distclean : tclxmlclean tkmpegclean htmlclean \
+	iisclean checkdnsclean $(SIGNALCLEAN) \
+	slaclean astclean \
 	riceclean hcompressclean plioclean \
 	$(OPTDIRCLEAN) \
-	saotkclean zipclean zvfsclean ds9clean srcclean \
+	saotkclean ds9clean srcclean \
 	dirsclean 
 	$(RM) core *~ *#