[eso-midas] 01/01: Fix compilation and lintian

Ole Streicher olebole-guest at moszumanska.debian.org
Mon Apr 21 10:38:35 UTC 2014


This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository eso-midas.

commit 53fce68a38024742566496093a51f51a83b58bba
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Apr 21 12:38:23 2014 +0200

    Fix compilation and lintian
---
 debian/clean                              |   1 +
 debian/control                            |  17 +-
 debian/copyright                          |   8 +-
 debian/lintian-overrides                  |   2 +
 debian/patches/fix_shellscripts.patch     | 146 ++++++
 debian/patches/propagate_buildflags.patch | 750 ++++++++++++++++++++++++++++++
 debian/patches/series                     |   2 +
 debian/rules                              |  38 +-
 debian/source/lintian-overrides           |   2 +
 9 files changed, 934 insertions(+), 32 deletions(-)

diff --git a/debian/clean b/debian/clean
index e0f85cb..64e70f7 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
 output0.cprg
+libsrc/ftoc
diff --git a/debian/control b/debian/control
index 7d7d2bd..5452a75 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,23 @@
 Source: eso-midas
 Section: science
 Priority: optional
-Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.debian.org>
 Uploaders: Ole Streicher <debian at liska.ath.cx>
-Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.4
+Build-Depends: debhelper (>= 9),
+               gfortran,
+               libmotif-dev,
+               libncurses-dev,
+               libx11-dev,
+               libxt-dev
+Standards-Version: 3.9.5
 Homepage: http://www.eso.org/projects/esomidas/
-Vcs-Git: git://anonscm.debian.org/debian-science/packages/eso-midas.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/eso-midas.git
+Vcs-Git: git://anonscm.debian.org/debian-astro/packages/eso-midas.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-astro/packages/eso-midas.git
 
 Package: eso-midas
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: The European Southern Observatory Munich Image Data Analysis System
+Description: European Southern Observatory Munich Image Data Analysis System
  The ESO-MIDAS system provides general tools for image processing and data
  reduction with emphasis on astronomical applications including imaging and
  special reduction packages for ESO instrumentation at La Silla and the VLT at
diff --git a/debian/copyright b/debian/copyright
index dfca615..7a0356b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
 Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=202
-Upstream-Name: 
+Upstream-Name:
 Upstream-Author:  Ralf Palsa <rpalsa at eso.org>,
  Lars Lundin <llundin at eso.org>
 Source: http://www.eso.org/sci/software/esomidas/midas-distrib.html
 
 Files: *
-Copyright: 
+Copyright:
  1985-2011 European Southern Observatory,
  1990 David E. Smyth,
  1990 by Auto-trol Technology Corporation, Denver, Colorado,
@@ -34,9 +34,9 @@ License: GPL-2+
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
-Notice: The web page claims that ESO-MIDAS 
+Notice: The web page claims that ESO-MIDAS
  <http://www.eso.org/sci/software/esomidas/> is a registered trademark.
- However, this is outdated, as the trademark ist cancelled since 1998. 
+ However, this is outdated, as the trademark ist cancelled since 1998.
 
 Files: debian/*
 Copyright: 2011 Ole Streicher <debian at liska.ath.cx>
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
new file mode 100644
index 0000000..a9f0718
--- /dev/null
+++ b/debian/lintian-overrides
@@ -0,0 +1,2 @@
+# False positive: this is not a license file.
+extra-license-file usr/lib/eso-midas/13SEP/prim/proc/license.prg
diff --git a/debian/patches/fix_shellscripts.patch b/debian/patches/fix_shellscripts.patch
new file mode 100644
index 0000000..c3ddf50
--- /dev/null
+++ b/debian/patches/fix_shellscripts.patch
@@ -0,0 +1,146 @@
+--- a/install/unix/select
++++ b/install/unix/select
+@@ -187,4 +187,3 @@
+ cd $MID_INSTALL
+ stty echo
+ exit 0
+-done
+--- a/install/unix/select.sh
++++ b/install/unix/select.sh
+@@ -187,4 +187,3 @@
+ cd $MID_INSTALL
+ stty echo
+ exit 0
+-done
+--- a/systab/ascii/display/ittasc.sh
++++ b/systab/ascii/display/ittasc.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#!/bin/sh
+ # @(#)ittasc.sh	19.1 (ESO-IPG) 02/25/03 14:30:08
+ # 
+ # Bourne shell script  ittasc.sh
+--- a/systab/ascii/display/lutasc.sh
++++ b/systab/ascii/display/lutasc.sh
+@@ -1,4 +1,4 @@
+-#!/usr/bin/sh
++#!/bin/sh
+ # 
+ # @(#)lutasc.sh	19.1 (ESO-IPG) 02/25/03 14:30:09
+ # Bourne shell script
+--- a/applic/proc/fitcref.sh
++++ b/applic/proc/fitcref.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # @(#)fitcref.sh	19.1 (ESO-IPG) 02/25/03 13:20:10
+ # Shell procedure fitcref.sh 
+ # called from fitcref.prg as $fitcref.sh
+--- a/applic/proc/fitrepf.sh
++++ b/applic/proc/fitrepf.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # @(#)fitrepf.sh	19.1 (ESO-IPG) 02/25/03 13:20:10
+ # Shell procedure fitcref.sh 
+ # called from fitcref.prg as $fitcref.sh
+--- a/contrib/tsa/proc/tsadelcrf.sh
++++ b/contrib/tsa/proc/tsadelcrf.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # @(#)tsadelcrf.sh	5.1 (ESO-IPG) 4/5/93 15:59:31
+ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
+ #.COPYRIGHT (c)  1992     European Southern Observatory and Warsaw Observatory
+--- a/contrib/tsa/proc/tsaintcrf.sh
++++ b/contrib/tsa/proc/tsaintcrf.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # @(#)tsaintcrf.sh	5.1 (ESO-IPG) 4/5/93 15:59:21
+ #+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
+ #.COPYRIGHT (c)  1992     European Southern Observatory and Warsaw Observatory
+--- a/monit/devices.sh
++++ b/monit/devices.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # -----------------------------------------------------------------------
+ #
+ # Bourne shell procedure  devices.sh
+--- a/monit/persil.sh
++++ b/monit/persil.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ cd $HOME/midwork
+ rm -f Midas_*
+ rm -f FORGR* 
+--- a/prim/help/gen_tapes.sh
++++ b/prim/help/gen_tapes.sh
+@@ -1,4 +1,4 @@
+-:
++#!/bin/sh
+ # @(#)gen_tapes.sh	19.1 (ESO-IPG) 02/25/03 14:03:22
+ # -----------------------------------------------------------------------
+ # Bourne shell procedure  to generate output for the tapede.alq file 
+--- a/prim/proc/rebcref.sh
++++ b/prim/proc/rebcref.sh
+@@ -1,4 +1,4 @@
+-:
++#!/bin/sh
+ # @(#)rebcref.sh	19.1 (ESO-IPG) 02/25/03 14:09:14
+ # 
+ # Shell procedure rebcref.sh
+--- a/system/exec/ftoc_nam.sh
++++ b/system/exec/ftoc_nam.sh
+@@ -1,4 +1,3 @@
+-:
+ #! /bin/sh
+ #  @(#)ftoc_nam.sh	19.1 (ESO-IPG) 02/25/03 14:31:08
+ # .COPYRIGHT: Copyright (c) 1988 European Southern Observatory,
+--- a/system/exec/hlqtohlc.sh
++++ b/system/exec/hlqtohlc.sh
+@@ -1,4 +1,3 @@
+-:
+ #! /bin/sh
+ # @(#)hlqtohlc.sh	19.1 (ESO-IPG) 02/25/03 14:31:08
+ # 
+--- a/system/unix/add_sccs
++++ b/system/unix/add_sccs
+@@ -1,4 +1,3 @@
+-:
+ #! /bin/sh
+ # @(#)add_sccs.sh	19.1 (ESO-IPG) 02/25/03 14:31:58 
+ 
+--- a/system/unix/add_sccs.sh
++++ b/system/unix/add_sccs.sh
+@@ -1,4 +1,3 @@
+-:
+ #! /bin/sh
+ # @(#)add_sccs.sh	19.1 (ESO-IPG) 02/25/03 14:31:58 
+ 
+--- a/system/unix/install.sh
++++ b/system/unix/install.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ # @(#)install.sh	19.1 (ESO-IPG) 02/25/03 14:31:59
+ #
+ #  Installation script for MIDAS from CD-ROM with binaries.
+--- a/system/unix/nmgrep
++++ b/system/unix/nmgrep
+@@ -1,4 +1,4 @@
+-:
++#!/bin/sh
+ # @(#)nmgrep.sh	19.1 (ESO-IPG) 02/25/03 14:32:00
+ pattern=$1
+ shift
+--- a/system/unix/nmgrep.sh
++++ b/system/unix/nmgrep.sh
+@@ -1,4 +1,4 @@
+-:
++#!/bin/sh
+ # @(#)nmgrep.sh	19.1 (ESO-IPG) 02/25/03 14:32:00
+ pattern=$1
+ shift
+--- a/system/unix/setmidas.sh
++++ b/system/unix/setmidas.sh
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ # @(#)setmidas.sh	19.1 (ESO-IPG) 02/25/03 14:32:00
+ # .COPYRIGHT: Copyright (c) 1988 European Southern Observatory,
diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
new file mode 100644
index 0000000..d0b37cc
--- /dev/null
+++ b/debian/patches/propagate_buildflags.patch
@@ -0,0 +1,750 @@
+--- a/contrib/template/libsrc/makefile
++++ b/contrib/template/libsrc/makefile
+@@ -14,7 +14,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LIB = $(LLIBDIR)/libtemplate.a
+ 
+--- a/contrib/template/src/makefile
++++ b/contrib/template/src/makefile
+@@ -15,7 +15,7 @@
+ 
+ M = ../../exec
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ #LLIB =  -L$(LLIBDIR) -ltemplate -L$(LIBDIR) -lmidas
+ LLIB =  -L$(LLIBDIR) -L$(LIBDIR) -lmidas
+--- a/contrib/wavelet/libsrc/makefile
++++ b/contrib/wavelet/libsrc/makefile
+@@ -14,7 +14,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LIB = $(LLIBDIR)/libwave2d.a
+ 
+--- a/contrib/wavelet/src/makefile
++++ b/contrib/wavelet/src/makefile
+@@ -15,7 +15,7 @@
+ 
+ M = ../../exec
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LLIB =  -L$(LLIBDIR) -lwave2d -L$(LIBDIR) -lmidas
+ 
+--- a/gui/GraphLib/libsrc/.Wcl/makefile
++++ b/gui/GraphLib/libsrc/.Wcl/makefile
+@@ -15,7 +15,7 @@
+ 
+ include ../../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
+ 
+ LLIBDIR = ../../../lib
+ LIB = $(LLIBDIR)/libWc.a
+--- a/gui/GraphLib/libsrc/.Xukc/makefile
++++ b/gui/GraphLib/libsrc/.Xukc/makefile
+@@ -18,7 +18,7 @@
+ INC = .
+ LINC = ../../../incl
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
+ 
+ LLIBDIR = ../../../lib
+ LIB = $(LLIBDIR)/libXukc.a
+--- a/gui/XAlice/libsrc/makefile
++++ b/gui/XAlice/libsrc/makefile
+@@ -13,7 +13,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) $(X11INC)
+ 
+ LIBOUT = ../../lib/libmgauss.a
+ 
+--- a/gui/XEchelle/libsrc/makefile
++++ b/gui/XEchelle/libsrc/makefile
+@@ -20,7 +20,7 @@
+ INC  = ../../GraphLib/libsrc/$(UIMX)/include
+ MINC = ../../../incl
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(GUI_OPT) $(SYS) -I$(LINC) -I$(INC) -I$(MINC) \
++CFLAGS += $(C_OPT) $(DEBUG) $(GUI_OPT) $(SYS) -I$(LINC) -I$(INC) -I$(MINC) \
+ 	$(X_CFLAGS) $(MOTIF_CFLAGS)  $(XMINC)    $(X11INC)
+ 
+ LIB = $(LLIBDIR)/libxech.a
+--- a/install/unix/systems/AIX/libsrc/os/unix/makefile
++++ b/install/unix/systems/AIX/libsrc/os/unix/makefile
+@@ -15,7 +15,7 @@
+ include ../../../default.mk
+ 
+ LINC = ../../../incl
+-CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LIB = $(LIBDIR)/libos.a
+ 
+--- a/install/unix/test/makefile
++++ b/install/unix/test/makefile
+@@ -22,7 +22,7 @@
+ XWLIB = $(X11_LIBPATH) -lX11
+ XMLIB = $(X11_LIBPATH) $(MOTIF_LIBPATH) $(X_LIBS)
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(LSYS) $(SYS) $(EDITFLAGS) $(OSSYS) $(UNDEFS) -I$(LINC) -I$(INC) $(X11INC) $(XMINC)
++CFLAGS += $(C_OPT) $(DEBUG) $(LSYS) $(SYS) $(EDITFLAGS) $(OSSYS) $(UNDEFS) -I$(LINC) -I$(INC) $(X11INC) $(XMINC)
+ 
+ .for.f:
+ 	rm -f $*.f
+--- a/libsrc/agl/makefile
++++ b/libsrc/agl/makefile
+@@ -27,7 +27,7 @@
+ 
+ include ../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC) $(X11INC) -DMIDAS
++CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC) $(X11INC) -DMIDAS
+ 
+ LIB = $(LIBDIR)/libagl3.a
+ M = ../../system/exec
+@@ -150,7 +150,7 @@
+ ag_wdef.o : ag_wdef.c $(HFILES)
+ 
+ aglinit.o:  aglinit.c $(HFILES)
+-	$(CC) $(CFLAGS) $(WINDOW) $(DRIVERS) $(CLINK) aglinit.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(WINDOW) $(DRIVERS) $(CLINK) aglinit.c
+ 
+ aglchar.o:  aglchar.c aglfonts.c $(HFILES)
+ agldash.o:  agldash.c  $(HFILES)
+--- a/libsrc/display/makefile
++++ b/libsrc/display/makefile
+@@ -10,7 +10,7 @@
+ 
+ include ../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC) $(X11INC)
++CFLAGS += $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC) $(X11INC)
+ 
+ LIB =   $(LIBDIR)/libdsp.a
+ 
+--- a/libsrc/ftoc-new/makefile
++++ b/libsrc/ftoc-new/makefile
+@@ -20,7 +20,7 @@
+ 
+ C_OPT =  $(K_OPT)
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
+ 
+ LIB = $(LIBDIR)/libftoc.a
+ 
+--- a/libsrc/ftoc-old/makefile
++++ b/libsrc/ftoc-old/makefile
+@@ -19,7 +19,7 @@
+ 
+ include ../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC)
+ 
+ LIB = $(LIBDIR)/libftoc.a
+ 
+--- a/libsrc/idi/cidi/x11/makefile
++++ b/libsrc/idi/cidi/x11/makefile
+@@ -19,7 +19,7 @@
+ 
+ include ../../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(OSSYS) $(SYS) -I$(INC) $(X11INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(OSSYS) $(SYS) -I$(INC) $(X11INC)
+ 
+ LIB = $(LIBDIR)/libidi.a
+ 
+--- a/libsrc/os/unix/makefile
++++ b/libsrc/os/unix/makefile
+@@ -19,7 +19,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(OSSYS) $(SYS) -I$(INC)
+ 
+ LIB = $(LIBDIR)/libos.a
+ 
+--- a/libsrc/plot/makefile
++++ b/libsrc/plot/makefile
+@@ -14,7 +14,7 @@
+ 
+ include ../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
+ 
+ LIB =	$(LIBDIR)/libplot.a
+ 
+--- a/libsrc/readline/makefile
++++ b/libsrc/readline/makefile
+@@ -16,7 +16,7 @@
+ 
+ LINC=.
+ INC=..
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) $(EDITFLAGS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) $(EDITFLAGS) -I$(LINC) -I$(INC)
+ 
+ LIB = $(LIBDIR)/libzreadline.a
+ 
+--- a/libsrc/st/makefile
++++ b/libsrc/st/makefile
+@@ -20,7 +20,7 @@
+ 
+ include ../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(SYS) -I$(INC)
+ 
+ LIB = $(LIBDIR)/libst.a
+ 
+--- a/libsrc/tbl/makefile
++++ b/libsrc/tbl/makefile
+@@ -21,7 +21,7 @@
+ 
+ include ../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(SH_OPT) $(DEBUG) $(SYS) -I$(INC)
+ 
+ HEADT = $(INC)/tblsys.h $(INC)/tbldef.h $(INC)/tblerr.h
+ 
+--- a/monit/makefile
++++ b/monit/makefile
+@@ -22,7 +22,7 @@
+ 
+ include ../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(EDITSWITCH) $(DEBUG) $(MEM_OPT) $(SYS) -I$(INC) -I../libsrc
++CFLAGS += $(C_OPT) $(EDITSWITCH) $(DEBUG) $(MEM_OPT) $(SYS) -I$(INC) -I../libsrc
+ 
+ LLIB  = libprep.a -L$(LIBDIR) -lmidas 
+ LLIB1 =	libprep.a -L$(LIBDIR) -lgen  -lxcon -lgmidas -lmidas 
+--- a/prim/dio/libsrc/makefile
++++ b/prim/dio/libsrc/makefile
+@@ -14,7 +14,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SH_OPT) $(SYS) -I$(INC)
+ 
+ 
+ LIB = $(LIBDIR)/libdio.a
+--- a/prim/display/libsrc/makefile
++++ b/prim/display/libsrc/makefile
+@@ -10,7 +10,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(INC)
+ 
+ LIB =   $(LIBDIR)/libdisp.a
+ 
+--- a/prim/general/libsrc/makefile
++++ b/prim/general/libsrc/makefile
+@@ -16,7 +16,7 @@
+ include ../../../local/default.mk
+ 
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
+ 
+ LIB = $(LIBDIR)/libgen.a
+ 
+--- a/prim/plot/libsrc/makefile
++++ b/prim/plot/libsrc/makefile
+@@ -13,7 +13,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(INC)
+ 
+ LIB =	$(LIBDIR)/libsubplot.a
+ 
+--- a/prim/plot/src/makefile
++++ b/prim/plot/src/makefile
+@@ -18,7 +18,7 @@
+ include ../../../local/default.mk
+ 
+ M      = ../../exec
+-CFLAGS = $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
+ 
+ #LLIB1 =	-L$(LIBDIR) -lsubplot -ldisp -lgen -lgmidas -lctab -ltw3 -ltc3 -lmidas 
+ #
+--- a/prim/table/libsrc/makefile
++++ b/prim/table/libsrc/makefile
+@@ -15,7 +15,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(UNDEFS) $(SYS) -I$(INC)
+ 
+ INCT = $(INC)/tablet.inc
+ INCS = $(INC)/tables.inc $(INC)/tabled.inc
+--- a/stdred/do/libsrc/makefile
++++ b/stdred/do/libsrc/makefile
+@@ -15,7 +15,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LIB = $(LLIBDIR)/libdo.a
+ 
+--- a/stdred/echelle/libsrc/makefile
++++ b/stdred/echelle/libsrc/makefile
+@@ -17,7 +17,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LIB	= $(LLIBDIR)/libech_nr.a
+ 
+--- a/stdred/echelle/src/makefile
++++ b/stdred/echelle/src/makefile
+@@ -22,7 +22,7 @@
+ #TABLEDIR = ../../../prim/table/libsrc
+ TABLEDIR = ../../../libsrc/math
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LLIB = -L$(LIBDIR) -lmidas
+ LLIB1 = -L$(LLIBDIR) -lspec -L$(LIBDIR) -lftab -lgen -lmidas
+--- a/stdred/feros/libsrc/makefile
++++ b/stdred/feros/libsrc/makefile
+@@ -22,7 +22,7 @@
+ # DEFINITIONS:
+ 
+ #DEBUG =
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) 
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) 
+ 
+ #LLIBDIR = ../lib
+ 
+--- a/stdred/feros/src/makefile
++++ b/stdred/feros/src/makefile
+@@ -24,7 +24,7 @@
+ #C_OPT = -O
+ #DEBUG = -g
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LLIB = -L$(LIBDIR) -lmidas -lm
+ LLIB1 = -L$(LLIBDIR) -lech -L$(LIBDIR) -lftab -lgen -lmidas -lm
+--- a/stdred/long/src/makefile
++++ b/stdred/long/src/makefile
+@@ -19,7 +19,7 @@
+ M	= ../../exec
+ SPE_INC	= ../../spec/incl
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -I$(SPE_INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -I$(SPE_INC)
+ 
+ LLIB = -L$(LIBDIR) -lmidas
+ 
+--- a/stdred/mmf/src/makefile
++++ b/stdred/mmf/src/makefile
+@@ -19,7 +19,7 @@
+ 
+ M = ../../exec
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LLIB = -L$(LIBDIR) -lmidas
+ LIBS =	$(LIBDIR)/libmidas.a 
+--- a/stdred/mos/libsrc/makefile
++++ b/stdred/mos/libsrc/makefile
+@@ -23,7 +23,7 @@
+ 
+ C_OPT =  $(K_OPT)
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) 
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) 
+ 
+ LIB = $(LLIBDIR)/libmos.a
+ 
+--- a/stdred/mos/src/makefile
++++ b/stdred/mos/src/makefile
+@@ -24,9 +24,9 @@
+ 
+ SPEC_INC = ../../spec/incl
+ 
+-#CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -Aa -D_HPUX_SOURCE
++#CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -Aa -D_HPUX_SOURCE
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -I$(SPEC_INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) -I$(SPEC_INC)
+ 
+ ## LLIB = -L$(LIBDIR) -lmidas -lm
+ ## LLIB1 = -L$(LLIBDIR) -lmos -L$(LIBDIR) -lmidas -lm
+--- a/stdred/optopus/src/makefile
++++ b/stdred/optopus/src/makefile
+@@ -19,7 +19,7 @@
+ 
+ M = ../../exec
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+  
+ LLIB  = -L$(LLIBDIR) -lopto -L$(LIBDIR) -lgen -lmidas
+ 
+--- a/stdred/spec/libsrc/makefile
++++ b/stdred/spec/libsrc/makefile
+@@ -17,7 +17,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ 
+ LIB = $(LLIBDIR)/libspec.a
+ 
+--- a/stdred/spec/src/makefile
++++ b/stdred/spec/src/makefile
+@@ -20,7 +20,7 @@
+ 
+ M = ../../exec
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) 
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC) 
+ 
+ LLIB1 =	-L$(LLIBDIR) -lspec -L$(LIBDIR) -lftab -lmidas
+ 
+--- a/system/idiserv/libsrc/makefile
++++ b/system/idiserv/libsrc/makefile
+@@ -20,7 +20,7 @@
+ 
+ include ../../../local/default.mk
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC) $(X11INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SH_OPT) $(SYS) -I$(INC) $(X11INC)
+ 
+ LIBOUT= $(LIBDIR)/libidicl.a
+ 
+--- a/system/idiserv/src/makefile
++++ b/system/idiserv/src/makefile
+@@ -25,7 +25,7 @@
+ 
+ M = ../../exec
+ 
+-CFLAGS = $(C_OPT) $(DEBUG) $(MEM_OPT) $(SYS) -I$(INC) $(X11INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(MEM_OPT) $(SYS) -I$(INC) $(X11INC)
+ 
+ LLIB0= -L$(LIBDIR) -lmidas
+ LLIB1 = -L$(LIBDIR) -lgmidas -lmidas
+--- a/monit/testmake
++++ b/monit/testmake
+@@ -17,7 +17,7 @@
+ C_OPT =
+ F_OPT =
+ SYS = 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ FFLAGS = $(F_OPT) $(DEBUG) -c 
+ EXFLAGS = -f
+ 
+--- a/prim/table/libsrc/makefile.c-only
++++ b/prim/table/libsrc/makefile.c-only
+@@ -28,7 +28,7 @@
+ C_OPT =
+ F_OPT =
+ SYS = 
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) -I$(LINC) -I$(INC)
+ FFLAGS = $(F_OPT) $(DEBUG) -c 
+ EXFLAGS = -f
+ 
+--- a/install/unix/default_mk
++++ b/install/unix/default_mk
+@@ -26,10 +26,10 @@
+ SHELL=/bin/sh
+ CC = cc
+ CP = cp
+-LDCC = cc
++LDCC = cc $(LDFLAGS)
+ F77 = f77
+ LD77_CMD = f77
+-LD77_OPT =
++LD77_OPT = $(LDFLAGS)
+ LD77 = $(LD77_CMD) $(LD77_OPT)
+ RANLIB = ranlib
+ STRIP = strip
+@@ -42,7 +42,7 @@
+ 
+ 
+ CLINK=-c
+-LD_OPT =
++LD_OPT = $(LDFLAGS)
+ DEBUG =
+ C_OPT =
+ F_OPT= 
+@@ -51,7 +51,7 @@
+ SH_CMD = echo
+ SH_OPT =
+ SH_EXT = so.8.1
+-CFLAGS = $(C_OPT) $(DEBUG) $(SYS) $(VARARGS) -I$(INC)
++CFLAGS += $(C_OPT) $(DEBUG) $(SYS) $(VARARGS) -I$(INC)
+ FFLAGS = $(F_OPT) $(DEBUG) -c
+ EFLAGS = $(E_OPT) -I$(INC) -I$(LINC) -f
+ EXFLAGS = -f
+@@ -64,7 +64,7 @@
+ MOTIF_LIBPATH =
+ XWLIB = $(X11_LIBPATH) -lX11
+ VMSLIB =
+-CPPLINE=$(CC) $(CFLAGS) $(CLINK) $<
++CPPLINE=$(CC) $(CPPFLAGS) $(CFLAGS) $(CLINK) $<
+ XOPEN_LIBS=
+ 
+ # RULES:
+@@ -80,11 +80,11 @@
+ 	$(F77) $(FFLAGS) $<
+ .fc.o: 
+ 	$(FORIF) $(FORIF_OPT) $< $*.c
+-	$(CC) $(CFLAGS) $(CLINK)  $*.c
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(CLINK)  $*.c
+ .fc.c: 
+ 	$(FORIF) $(FORIF_OPT) $< $@
+ .c.o:
+-	$(CC) $(CFLAGS) $(CLINK)  $<
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(CLINK)  $<
+ .o.mod:
+ 	$(CP) $< $*.mod
+ .sh:
+--- a/gui/GraphLib/libsrc/Comm/makefile
++++ b/gui/GraphLib/libsrc/Comm/makefile
+@@ -19,7 +19,7 @@
+ LLIBDIR = ../../../lib
+ LIB = $(LLIBDIR)/libcom.a
+ 
+-CFLAGS    = $(C_OPT) $(DEBUG) $(GUI_OPT) $(SYS) \
++CFLAGS    += $(C_OPT) $(DEBUG) $(GUI_OPT) $(SYS) \
+ 	    -I$(LINC) -I$(INC) $(X11INC) $(XMINC)
+ 
+ OBJ =  dialog.o misc.o SetResources.o filelist.o 
+--- a/gui/GraphLib/libsrc/uimxR5/src/makefile
++++ b/gui/GraphLib/libsrc/uimxR5/src/makefile
+@@ -33,7 +33,7 @@
+ 
+ INCLUDES =  -I. -I../include -I$(INC) $(X11INC) $(XMINC)
+ 
+-CFLAGS    = $(C_OPT) $(DEBUG) $(GUI_OPT) $(INCLUDES) \
++CFLAGS    += $(C_OPT) $(DEBUG) $(GUI_OPT) $(INCLUDES) \
+            -DRUNTIME -DUSE_STDLIB -DMOTIF_WIDGETS -DSAFE_MALLOC \
+            -D$(CATALOG)_CATALOG -D_PTY_DRIVER
+ 
+--- a/system/ftoc-new/makefile
++++ b/system/ftoc-new/makefile
+@@ -46,8 +46,8 @@
+ 	$(STRIP) $@
+ 
+ $(M)/ftoc_comm.exe: $(INC)/ftoc_commc.h ftoc_commf.o ftoc_commff.o ftoc_commc.c
+-	$(CC) $(CFLAGS) -c ftoc_commc.c $(DEV_NULL); \
+-	$(CC) $(CFLAGS) -c ftoc_commap.c $(DEV_NULL); \
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c ftoc_commc.c $(DEV_NULL); \
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c ftoc_commap.c $(DEV_NULL); \
+ 	$(LD77_CMD) $(OBJ3) $(SLIB) -o $@ $(DEV_NULL)  
+ 
+ $(M)/ftoc_generic.exe:: $(OBJ5)
+--- a/system/machine/makefile
++++ b/system/machine/makefile
+@@ -31,8 +31,8 @@
+ 	$(STRIP) $@
+ 
+ computer.o: computer.c
+-	$(CC) $(CFLAGS) -c computer.c $(DEV_NULL) ||  \
+-	$(CC) $(CFLAGS) -DNO_FLOAT_H  -c computer.c $(DEV_NULL)
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c computer.c $(DEV_NULL) ||  \
++	$(CC) (CPPFLAGS) $(CFLAGS) -DNO_FLOAT_H  -c computer.c $(DEV_NULL)
+ 
+ $(INC)/computer.h: $(M)/computer.exe
+ 	$(M)/computer.exe $@
+--- a/gui/XBatch/src/makefile
++++ b/gui/XBatch/src/makefile
+@@ -46,7 +46,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT) \
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT) \
+ 		  -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/gui/XAlice/src/makefile
++++ b/gui/XAlice/src/makefile
+@@ -53,7 +53,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT) \
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT) \
+ 		  -I$(LINC) -I$(INC) -I$(GINC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/gui/XDisplay/src/makefile
++++ b/gui/XDisplay/src/makefile
+@@ -47,7 +47,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT) \
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT) \
+ 		  -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/gui/XDo/src/makefile
++++ b/gui/XDo/src/makefile
+@@ -54,7 +54,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT) \
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT) \
+ 		  -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/gui/XEchelle/src/makefile
++++ b/gui/XEchelle/src/makefile
+@@ -59,7 +59,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT) \
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT) \
+ 		  $(LINC) -I$(INC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/gui/XFilter/src/makefile
++++ b/gui/XFilter/src/makefile
+@@ -80,7 +80,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT) \
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT) \
+ 		  -I$(LINC) -I$(INC) -I$(GINC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/gui/XHelp/src/makefile
++++ b/gui/XHelp/src/makefile
+@@ -49,7 +49,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT) \
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT) \
+ 		  -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/gui/XIdent/src/makefile
++++ b/gui/XIdent/src/makefile
+@@ -41,7 +41,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT) \
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT) \
+ 		  -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/gui/XIrspec/src/makefile
++++ b/gui/XIrspec/src/makefile
+@@ -50,7 +50,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT) \
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT) \
+ 		  -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/gui/XLong/src/makefile
++++ b/gui/XLong/src/makefile
+@@ -53,7 +53,7 @@
+ X_CFLAGS	=
+ MOTIF_CFLAGS	=
+ 
+-CFLAGS		= $(C_OPT) $(DEBUG) $(GUI_OPT)\
++CFLAGS		+= $(C_OPT) $(DEBUG) $(GUI_OPT)\
+ 		  -I$(LINC) -I$(INC) -I$(UX_DIR)/include \
+ 		  $(X_CFLAGS) $(MOTIF_CFLAGS) -DXOPEN_CATALOG \
+ 		  $(XMINC)    $(X11INC)
+--- a/install/unix/systems/Linux_AMD64/make_options
++++ b/install/unix/systems/Linux_AMD64/make_options
+@@ -7,8 +7,8 @@
+ #  
+ 
+ CC=gcc
+-LDCC=gcc
+-
++LDCC=gcc $(LDFLAGS)
++LD77_CMD=gfortran $(LDFLAGS)
+ 
+ F_OPT=-O -fPIC
+ C_OPT=-O -fPIC
+--- a/install/unix/install1
++++ b/install/unix/install1
+@@ -331,12 +331,12 @@
+ # 64 bit compiler
+ else
+    echo installing Midas on a 64 bit system
+-   MACH="-m64"
+-   EO="-Z"
++   MACH=" "
++   EO=" "
+ fi
+  
+ ed_moptions add "F77=gfortran $MACH" >/dev/null
+-ed_moptions add "LD77_CMD=gfortran $MACH"  >/dev/null
++ed_moptions add "LD77_CMD=gfortran $MACH $LDFLAGS"  >/dev/null
+ ed_moptions add "E_OPT= $EO"  >/dev/null
+ 
+ 
+@@ -614,7 +614,7 @@
+   x11incl="found"
+ else
+   ed_moptions delete X11INC >/dev/null
+-  x11inclpth='/usr/openwin/include /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include'
++  x11inclpth='/usr/include/X11 /usr/include/X11R6 /usr/include/X11R5 /usr/X11R6/include /usr/X11R6/include/X11 /usr/X11R5/include /usr/local/include /include /usr/X/include'
+   for dir in $x11inclpth
+   do
+     if [ ! -d $dir ]; then
+--- a/applic/general/etc/makefile
++++ b/applic/general/etc/makefile
+@@ -16,7 +16,7 @@
+ 
+ all: clean
+ 	@(PCK=`pwd | sed -e 's/\/etc$$//' -e 's/^.*\///'`; \
+-	for file in *.ctx; \
++	for file in `ls *.ctx`; \
+                 do  (cd $(CTXDIR); $(LN) ../applic/$$PCK/etc/$$file $$file;) \
+ 	done)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index e774f7b..6c08fb4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 output-to-stdout.patch
 setup-debian.patch
 writting.patch
+fix_shellscripts.patch
+propagate_buildflags.patch
diff --git a/debian/rules b/debian/rules
index 5e75807..51dfcd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,36 +27,30 @@ override_dh_auto_configure:
 	(cd $(MID_HOME); $(MID_INSTALL)/preinstall -a)
 
 override_dh_auto_build:
-	(cd $(MID_HOME); yes | $(MID_INSTALL)/install1 -a CFLAGS=\"$(CFLAGS)\")
+	(cd $(MID_HOME); $(MID_INSTALL)/install1 -a CFLAGS=\"$(CFLAGS)\" )
 	#(cd $(MID_HOME); MIDASHOME=/usr/lib/eso-midas $(MID_INSTALL)/setup -a)
 	$(INMIDAS) -j "@ compile.all"
 	$(INMIDAS) -j "@ ascii_bin no ; bye"
 	(cd $(MID_HOME) ; yes | $(CLEANMIDAS) -a)
 
 override_dh_install:
-	dh_install $(MIDVERS)/system/unix/inmidas usr/bin
-	dh_install $(MIDVERS)/system/unix/gomidas usr/bin
-	dh_install $(MIDVERS)/system/unix/helpmidas usr/bin
-	dh_install $(MIDVERS)/lib/*.so* usr/lib/eso-midas/$(MIDVERS)/lib
-	for src in `find $(MIDVERS) -name \*.exe -type f` ; do \
-	  ( target=usr/lib/eso-midas/`dirname $$src` ;\
-	  echo dh_install $$src $$target ;\
-	  dh_install $$src $$target );\
-	done
-	for src in `find $(MIDVERS) -regex ".+\(hlc\|prg\|ctx\)" -type f` ; do \
-	  ( target=usr/share/eso-midas/`dirname $$src` ;\
-	  echo dh_install $$src $$target ;\
-	  dh_install $$src $$target );\
-	done
+	dh_install $(MIDVERS) usr/lib/eso-midas/ -X.mod -XCOPYING -Xsetup~
 
 override_dh_link:
-	dh_link
-	for src in `find debian/eso-midas/usr/share/eso-midas -type d` ; do \
-	  ( src=`echo $$src | cut -d/ -f3-` ;\
-	  target=`echo $$src | sed s+usr/share+usr/lib+` ;\
-	  echo dh_link $$src $$target ;\
-	  dh_link $$src $$target );\
-	done
+	dh_link /usr/lib/eso-midas/$(MIDVERS)/system/unix/inmidas usr/bin/inmidas
+	dh_link /usr/lib/eso-midas/$(MIDVERS)/system/unix/gomidas usr/bin/gomidas
+	dh_link /usr/lib/eso-midas/$(MIDVERS)/system/unix/helpmidas usr/bin/helpmidas
+
+override_dh_fixperms:
+	dh_fixperms
+	chmod 0644 debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.fit \
+	           debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.fmt \
+	           debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.datorg \
+	           debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.prg \
+	           debian/eso-midas/usr/lib/eso-midas/13SEP/contrib/baches/*/*.README \
+	           debian/eso-midas/usr/lib/eso-midas/13SEP/system/unix/makefile
+	find debian/eso-midas/usr/lib/eso-midas/13SEP/ -name \*.sh | xargs chmod 0755 
+	chmod 0755 debian/eso-midas/usr/lib/eso-midas/13SEP/util/bench/brun
 
 override_dh_clean:
 	dh_clean
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..ddc66f3
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# This link is removed and overridden in the build
+source-contains-unsafe-symlink libsrc/ftoc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/eso-midas.git



More information about the debian-science-commits mailing list