--- SAOImageDS9/ds9/unix/Makefile.in.orig	2020-11-18 21:31:12.000000000 +0100
+++ SAOImageDS9/ds9/unix/Makefile.in	2020-12-23 16:20:20.401187689 +0100
@@ -22,23 +22,10 @@
 vector_LIB_SPEC= @vector_LIB_SPEC@
 fitsy_LIB_SPEC= @fitsy_LIB_SPEC@
 
-tifftcl_LIB_SPEC= @tifftcl_LIB_SPEC@
-jpegtcl_LIB_SPEC= @jpegtcl_LIB_SPEC@
-zlibtcl_LIB_SPEC= @zlibtcl_LIB_SPEC@
-
-tkimg_LIB_SPEC	= @tkimg_LIB_SPEC@
-tkimgjpeg_LIB_SPEC= @tkimgjpeg_LIB_SPEC@
-tkimgtiff_LIB_SPEC= @tkimgtiff_LIB_SPEC@
-tkimgwindow_LIB_SPEC= @tkimgwindow_LIB_SPEC@
-
 tcliis_LIB_SPEC	= @tcliis_LIB_SPEC@
 tclfitsy_LIB_SPEC= @tclfitsy_LIB_SPEC@
 tclsignal_LIB_SPEC= @tclsignal_LIB_SPEC@
-tclxml_LIB_SPEC	= @tclxml_LIB_SPEC@
-tclzipfs_LIB_SPEC= @tclzipfs_LIB_SPEC@
-tls_LIB_SPEC	=@tls_LIB_SPEC@
 
-tkblt_LIB_SPEC	= @tkblt_LIB_SPEC@
 tkhtml1_LIB_SPEC= @tkhtml1_LIB_SPEC@
 tkmpeg_LIB_SPEC	= @tkmpeg_LIB_SPEC@
 tkagif_LIB_SPEC	= @tkagif_LIB_SPEC@
@@ -90,29 +77,15 @@
 	$(tcliis_LIB_SPEC) \
 	$(tclfitsy_LIB_SPEC) \
 	$(tclsignal_LIB_SPEC) \
-	$(tclxml_LIB_SPEC) \
-	$(tclzipfs_LIB_SPEC) \
-	$(tls_LIB_SPEC) \
-	$(tkblt_LIB_SPEC) \
 	$(tkhtml1_LIB_SPEC) \
-	$(tkimg_LIB_SPEC) \
-	$(tkimgjpeg_LIB_SPEC) \
-	$(tkimgtiff_LIB_SPEC) \
-	$(tkimgwindow_LIB_SPEC) \
 	$(tkmpeg_LIB_SPEC) \
 	$(tkagif_LIB_SPEC) \
 	$(tksao_LIB_SPEC) \
 	$(tktable_LIB_SPEC) \
-	$(jpegtcl_LIB_SPEC) \
-	$(tifftcl_LIB_SPEC) \
-	$(zlibtcl_LIB_SPEC) \
 	$(fitsy_LIB_SPEC) \
 	$(vector_LIB_SPEC) \
-	$(util_LIB_SPEC) \
-	$(TK_STUB_LIB_SPEC) \
-	$(TK_LIB_SPEC) \
-	$(TCL_STUB_LIB_SPEC) \
-	$(TCL_LIB_SPEC)
+	$(util_LIB_SPEC) 
+
 
 LLIBS	= \
 	$(subst /$(space),/,$(patsubst -L%,%/,$(patsubst -l%,lib%.a,$(SPECS)))) \
@@ -120,27 +93,16 @@
 	$(libdir)/libast_err.a \
 	$(libdir)/libast_pal.a \
 	$(subst /$(space),/,$(patsubst -L%,%/,$(patsubst -l%,lib%.a,$(tksao_LIB_SPEC)))) \
-	$(libdir)/libfuntools.a \
-	$(libdir)/libxpa.a
+	$(libdir)/libfuntools.a
 
 PREQS	= \
 	$(APPDIR) \
-	$(LIBDIR)/tcl$(TCL_VERSION) \
-	$(LIBDIR)/tcl8 \
-	$(LIBDIR)/tk$(TCL_VERSION) \
 	$(LIBDIR)/library \
 	$(LIBDIR)/msgs \
 	$(LIBDIR)/doc \
 	$(LIBDIR)/cmaps \
 	$(LIBDIR)/template \
-	$(LIBDIR)/tls \
-	$(LIBDIR)/tkblt \
 	$(LIBDIR)/tkcon \
-	$(LIBDIR)/base64 \
-	$(LIBDIR)/ftp \
-	$(LIBDIR)/log \
-	$(LIBDIR)/textutil \
-	$(LIBDIR)/math \
 	$(LIBDIR)/awthemes \
 	$(LIBDIR)/ttkthemes \
 	$(LIBDIR)/scidthemes
@@ -150,49 +112,24 @@
 .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 $(prefix)/bin/.
-
-debug	: ds9base ds9.zip
-	$(RM) ds9
-	cat ds9base ds9.zip > ds9
-	zip -A ds9
-	chmod 755 ds9
-	cp ds9 $(prefix)/bin/.
-
-else
-
 ds9	: ds9base ds9.zip
 	$(RM) ds9
-	strip ds9base
-	cp ds9base ds9
-	cp ds9 $(prefix)/bin/.
-	cp ds9.zip $(prefix)/bin/.
-#	cd $(prefix)/bin; codesign -s "$(ID)" ds9
-
-debug: ds9base ds9.zip
-	$(RM) ds9
 	cp ds9base ds9
-	cp ds9 $(prefix)/bin/.
-	cp ds9.zip $(prefix)/bin/.
-#	cd $(prefix)/bin; codesign -s "$(ID)" ds9
-
-endif
+	chmod 755 ds9
+	cp ds9 ../../bin/.
+	mkdir ../../share/ds9
+	$(RM) -r -f mntpt
+	unzip ds9.zip
+	chmod 644 mntpt/library/*.tcl
+	cp -a mntpt ../../share/ds9
 
 ds9base	: $(OBJS) $(LLIBS)
 	$(RM) $@
-	$(CXX) $(CFLAGS) -o $@ \
+	$(CXX) $(CFLAGS) -Wl,--export-dynamic -o $@ \
 	$(OBJS) \
+	$(TCL_LIB_SPEC) $(TK_LIB_SPEC)  \
 	$(LLIBS) \
 	-L $(prefix)/openssl -lssl -lcrypto \
-	$(TK_LIBS) \
 	$(LIBS)
 
 ds9.zip	: $(PREQS)
@@ -202,22 +139,12 @@
 	$(COMPILE) -DTK_LOCAL_APPINIT=SAOAppInit \
 	-DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c $? -o $@
 
-tkAppInit.c : $(prefix)/tk$(TCL_VERSION)/unix/tkAppInit.c
+tkAppInit.c : /usr/share/tk8.6/tkAppInit.c
 	cp $? .
 
 $(APPDIR) : 
 	mkdir -p $@
 
-$(LIBDIR)/tcl$(TCL_VERSION) :
-	cp -prf $(prefix)/lib/tcl$(TCL_VERSION) $(LIBDIR)/.
-
-$(LIBDIR)/tcl8 :
-	cp -prf $(prefix)/lib/tcl8 $(LIBDIR)/.
-
-$(LIBDIR)/tk$(TCL_VERSION) :
-	cp -prf $(prefix)/lib/tk$(TCL_VERSION) $(LIBDIR)/.
-	rm -rf $(APPDIR)/tk$(TCL_VERSION)/images
-	rm -rf $(APPDIR)/tk$(TCL_VERSION)/demos
 
 #--------------------------awthemes