--- saods9/ds9/unix/Makefile.in.orig	2016-06-27 19:41:50.000000000 +0200
+++ saods9/ds9/unix/Makefile.in	2017-02-14 18:20:04.708960663 +0100
@@ -40,11 +40,7 @@
 OBJS	= ds9.o tkAppInit.o
 
 FILES	= \
-	$(ZDIR)/tcl$(TCLVER) \
-	$(ZDIR)/tcl8 \
-	$(ZDIR)/tk$(TCLVER) \
 	$(ZDIR)/tkblt \
-	$(ZDIR)/tcllib \
 	$(ZDIR)/tkcon \
 	$(ZDIR)/library \
 	$(ZDIR)/msgs \
@@ -61,20 +57,8 @@
 	../../lib/tksao$(TKSAOVER)/libtksao$(TKSAOVER).a \
 	../../lib/tkhtml1$(TKHTMLVER)/libtkhtml1$(TKHTMLVER).a \
 	../../lib/tkmpeg$(TKMPEGVER)/libtkmpeg$(TKMPEGVER).a \
-	../../lib/Tclxml$(TCLXMLVER)/libTclxml$(TCLXMLVER).a \
 	../../lib/Tktable$(TKTABLEVER)/libTktable$(TKTABLEVER).a \
-	../../lib/Img$(TKIMGVER)/libtkimgpng1.4.2.a \
-	../../lib/Img$(TKIMGVER)/libpngtcl1.4.12.a \
-	../../lib/Img$(TKIMGVER)/libtkimgtiff1.4.2.a \
-	../../lib/Img$(TKIMGVER)/libtifftcl3.9.4.a \
-	../../lib/Img$(TKIMGVER)/libtkimgjpeg1.4.2.a \
-	../../lib/Img$(TKIMGVER)/libjpegtcl8.4.a \
-	../../lib/Img$(TKIMGVER)/libtkimggif1.4.2.a \
-	../../lib/Img$(TKIMGVER)/libtkimgwindow1.4.2.a \
-	../../lib/Img$(TKIMGVER)/libzlibtcl1.2.8.a \
-	../../lib/Img$(TKIMGVER)/libtkimg1.4.2.a \
 	../../lib/tclzvfs$(TCLZVFSVER)/libtclzvfs$(TCLZVFSVER).a \
-	../../lib/libxpa.a \
 	../../lib/tcliis$(TCLIISVER)/libtcliis$(TCLIISVER).a \
 	../../lib/tclcheckdns$(TCLCHECKDNSVER)/libtclcheckdns$(TCLCHECKDNSVER).a \
 	../../lib/tclsignal$(TCLSIGNALVER)/libtclsignal$(TCLSIGNALVER).a \
@@ -86,32 +70,17 @@
 .NOTPARALLEL :
 .PHONY	: debug
 
-ifeq (,$(findstring Darwin,$(system)))
 
 ds9	: ds9base ds9.zip
 	$(RM) ds9
-	strip ds9base
-	cat ds9base ds9.zip > ds9
-	zip -A ds9
-	chmod 755 ds9
-	cp ds9 ../../bin/.
-
-debug	: ds9base ds9.zip
-	$(RM) ds9
-	cat ds9base ds9.zip > ds9
-	zip -A ds9
+	cp ds9base ds9
 	chmod 755 ds9
 	cp ds9 ../../bin/.
-
-else
-
-ds9	: ds9base ds9.zip
-	$(RM) ds9
-	strip ds9base
-	cp ds9base ds9
-	cp ds9 ../../bin/.
-	cp ds9.zip ../../bin/.
-	cd ../../bin; codesign -s "$(ID)" ds9
+	mkdir ../../share/ds9
+	$(RM) -r -f zvfsmntpt
+	unzip ds9.zip
+	chmod 644 zvfsmntpt/library/*.tcl
+	cp -a zvfsmntpt ../../share/ds9
 
 debug: ds9base ds9.zip
 	$(RM) ds9
@@ -120,11 +89,10 @@
 	cp ds9.zip ../../bin/.
 	cd ../../bin; codesign -s "$(ID)" ds9
 
-endif
 
 ds9base	: $(OBJS) $(LLIBS)
 	$(RM) $@
-	$(CC) $(CFLAGS) -o $@ \
+	$(CC) $(CFLAGS) -Wl,--export-dynamic -o $@ \
 	$(OBJS) \
 	$(LLIBS) \
 	$(LIBS) \
@@ -141,40 +109,18 @@
 	$(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \
 	-DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c tkAppInit.c -o $@
 
-tkAppInit.c : ../../tk$(TCLVER)/unix/tkAppInit.c
-	cp ../../tk$(TCLVER)/unix/tkAppInit.c .
+tkAppInit.c : /usr/share/tk8.6/tkAppInit.c
+	cp /usr/share/tk8.6/tkAppInit.c .
+
 
 $(ZDIR)	: 
 	mkdir $@
 
-$(ZDIR)/tcl$(TCLVER) : ../../lib/tcl$(TCLVER)
-	$(RM) -r $@
-	cp -r ../../lib/tcl$(TCLVER) $(ZDIR)/.
-
-$(ZDIR)/tcl8 : ../../lib/tcl8
-	$(RM) -r $@
-	cp -r ../../lib/tcl8 $(ZDIR)/.
-
-$(ZDIR)/tk$(TCLVER) : ../../lib/tk$(TCLVER)
-	$(RM) -r $@
-	cp -r ../../lib/tk$(TCLVER) $(ZDIR)/.
-	rm -rf $(ZDIR)/tk$(TCLVER)/images
-	rm -rf $(ZDIR)/tk$(TCLVER)/demos
-
 $(ZDIR)/tkblt :
 	$(RM) -r $@
 	mkdir $(ZDIR)/tkblt
 	cp ../../tkblt/library/graph.tcl $(ZDIR)/tkblt/.
 
-$(ZDIR)/tcllib :
-	$(RM) -r $@
-	mkdir $(ZDIR)/tcllib
-	cp -r ../../tcllib/modules/base64 $(ZDIR)/tcllib/.
-	cp -r ../../tcllib/modules/ftp $(ZDIR)/tcllib/.
-	cp -r ../../tcllib/modules/log $(ZDIR)/tcllib/.
-	cp -r ../../tcllib/modules/textutil $(ZDIR)/tcllib/.
-	cp -r ../../tcllib/modules/math $(ZDIR)/tcllib/.
-
 $(ZDIR)/tkcon : ../../lib/tkcon$(TKCONVER)
 	$(RM) -r $@
 	cp -r ../../lib/tkcon$(TKCONVER) $@
@@ -209,6 +155,6 @@
 	cd ../library; $(MAKE) clean
 	$(RM) core *~ *# ds9base ds9 *.zip *.o
 	$(RM) -r $(ZDIR)
-
+	$(RM) -r ../../share/ds9
 distclean: clean
 	-rm -f Makefile config.cache config.log config.status