[SCM] image display tool for astronomy branch, debian, updated. c5f41a47f373171f5fc03cfe1d40089941a40d39

[Ole Streicher]

The following commit has been merged in the debian branch:
commit c5f41a47f373171f5fc03cfe1d40089941a40d39
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jan 10 00:00:43 2012 +0100

    Make a guess on changes in Makefile based on makefiles.patch

diff --git a/debian/patches/main-ds9.patch b/debian/patches/main-ds9.patch
index c131f10..ee3bd46 100644
--- a/debian/patches/main-ds9.patch
+++ b/debian/patches/main-ds9.patch
@@ -204,3 +204,52 @@
  
  #OPTS	= ${XX} ${ZZ}
  OPTS	= ${YY} ${ZZ}
+--- a/Makefile
++++ b/Makefile
+@@ -301,23 +301,23 @@ tclxml	: FORCE
+ 
+ tkimg	: FORCE
+ 	@echo "Installing TKIMG..."
+-	cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) --with-tk=$(root)/$(TKDIRDIR) $(TKIMGFLAGS) --disable-shared
++	cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' LDFLAGS='$(LIBS)' ./configure --prefix $(root) $(TKIMGFLAGS) --disable-shared
+ 	cd $(TKIMGDIR); $(MAKE) install
+ 
+ tkmpeg	: FORCE
+ 	@echo "Installing TKMPEG..."
+-	cd $(TKMPEGDIR); $(MAKE)
++	cd $(TKMPEGDIR); $(MAKE) CXXOPT="$(CXXOPT)"
+ 	cd $(TKMPEGDIR); $(MAKE) install
+ 
+ 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); $(MAKE)
++	cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(CXXOPTS)' LDFLAGS='$(LIBS)' $(PREHTMLFLAGS) $(root)/htmlwidget/configure --prefix $(root) $(XFLAGS) --enable-shared=no
++	cd $(HTMLDIR); $(MAKE) headers libtkhtml.a
+ 	cp $(HTMLDIR)/libtkhtml.a lib/.
+ 
+ xpa	: FORCE
+ 	@echo "Installing XPA..."
+-	cd $(XPADIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(OPTS) $(LIBS)' ./configure --prefix $(root) --with-tcl=$(root)/$(TCLDIRDIR) $(XPAFLAGS) --disable-shared
++	cd $(XPADIR); CC='$(CC)' CFLAGS='$(CCOPTS)' LDFLAGS='$(OPTS) $(LIBS)' ./configure --prefix $(root) $(XPAFLAGS) --disable-shared
+ 	cd $(XPADIR); $(MAKE); $(MAKE) install
+ 	cd bin; strip xpa*
+ 
+@@ -335,7 +335,7 @@ signal: FORCE
+ 
+ funtools: FORCE
+ 	@echo "Installing Funtools..."
+-	cd $(FUNTOOLSDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-zlib=../../lib/libz.a --with-wcslib=../lib/libwcs.a --enable-mainlib $(FUNTOOLSFLAGS)
++	cd $(FUNTOOLSDIR); CC='$(CC)' CFLAGS='$(OPTS)' LDFLAGS='$(LIBS)' ./configure --prefix $(root) --with-zlib=-lz --with-wcslib=../lib/libwcs.a --enable-mainlib $(FUNTOOLSFLAGS)
+ 	cd $(FUNTOOLSDIR); $(MAKE) lib
+ 	cp $(FUNTOOLSDIR)/libfuntools.a lib/.
+ 
+@@ -378,7 +378,7 @@ endif
+ 
+ saotk	: FORCE
+ 	@echo "Installing SAOTK..."
+-	cd $(SAOTKDIR); $(MAKE) install
++	cd $(SAOTKDIR); $(MAKE) CXX="$(CXX)" install
+ 
+ zip	: FORCE
+ 	@echo "Installing ZIP..."

-- 
image display tool for astronomy