[eso-midas] 01/01: Use Debian specific flag directory

[Ole Streicher]

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 8511637d8734e485234fd327d09aaa2421fdf19e
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Apr 22 14:44:17 2014 +0200

    Use Debian specific flag directory
---
 debian/patches/propagate_buildflags.patch | 13 ------
 debian/patches/setup-debian.patch         | 70 +++++++++++++++++++++----------
 2 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/debian/patches/propagate_buildflags.patch b/debian/patches/propagate_buildflags.patch
index 3a1bc90..0aa9294 100644
--- a/debian/patches/propagate_buildflags.patch
+++ b/debian/patches/propagate_buildflags.patch
@@ -708,19 +708,6 @@ Description: Propagate CFLAGS, CPPFLAGS and LDFLAGS
  		  -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 @@
diff --git a/debian/patches/setup-debian.patch b/debian/patches/setup-debian.patch
index f3ee91d..8a31a0e 100644
--- a/debian/patches/setup-debian.patch
+++ b/debian/patches/setup-debian.patch
@@ -1,30 +1,56 @@
 Author: Ole Streicher <debian at liska.ath.cx>
 Description: Debian specific changes
+--- a/install/unix/preinstall
++++ b/install/unix/preinstall
+@@ -121,7 +121,10 @@
+ urels=`(uname -r) 2>/dev/null`
+ machine=`(uname -m) 2>/dev/null`
+ 
+-if [ "$uname" = "Darwin" ]; then
++if [ -d "Debian" ];  then
++    system="Debian"
++
++elif [ "$uname" = "Darwin" ]; then
+     system="Darwin"
+ 
+ elif [ "$machine" = "x86_64" ]; then
 --- /dev/null
-+++ b/local/setup
++++ b/install/unix/systems/Debian/make_options
+@@ -0,0 +1,10 @@
++CC=gcc
++LDCC=gcc $(LDFLAGS)
++LD77_CMD=gfortran $(LDFLAGS)
++F_OPT=-O -fPIC
++C_OPT=-O -fPIC
++SYS=-DLinuxAMD64 -DGCC
++SLIB=-Wl,-rpath,/usr/lib/eso-midas/$(MIDVERS)/lib
++SH_OPT=-fPIC
++SH_CMD=$(MIDASHOME)/$(MIDVERS)/local/make_shared
++GUI_OPT=-DPATH_MAX=1024 -Ddg88
+--- /dev/null
++++ b/install/unix/systems/Debian/make_shared
+@@ -0,0 +1,6 @@
++#!/bin/sh
++shift
++library=`basename $1 | sed 's/\.so\..*$//'`
++gcc $LDFLAGS -shared -Wl,-soname,$1 -o $* -lm
++rm -f $library.so
++ln -s $1 $library.so
+--- /dev/null
++++ b/install/unix/systems/Debian/setup
 @@ -0,0 +1,4 @@
-+host_os=PC/Linux64
++host_os=Debian
 +debugger=gdb
 +ps_print="lpr -h -P"
 +ascii_print="lpr -h -P"
---- a/install/unix/systems/Linux_AMD64/make_options
-+++ b/install/unix/systems/Linux_AMD64/make_options
-@@ -19,7 +19,7 @@
- SYS=-DLinuxAMD64 -DGCC
- 
+--- a/install/unix/ed_moptions
++++ b/install/unix/ed_moptions
+@@ -51,7 +51,7 @@
+ op=$1
+ key=`echo $2 | awk -F= '{print $1}'`
+ options=`echo $2 | sed 's/^'$key'=//'`
+-options=`eval echo $options`
++options=`eval echo ${options:-""}`
+ oldoptions=""
  
--SLIB=-Wl,-rpath $(MIDASHOME)/$(MIDVERS)/lib
-+SLIB=-Wl,-rpath,/usr/lib/eso-midas/$(MIDVERS)/lib
- SH_OPT=-fPIC
- SH_CMD=$(MIDASHOME)/$(MIDVERS)/local/make_shared
- GUI_OPT=-DPATH_MAX=1024 -Ddg88
---- a/install/unix/systems/Linux_AMD64/make_shared
-+++ b/install/unix/systems/Linux_AMD64/make_shared
-@@ -7,6 +7,6 @@
- #gcc -shared -Wl,-soname,$library$sh_ext -o $*
- #
- # For Linux 2.0.0
--gcc -shared -Wl,-soname,$1 -o $*
-+gcc $LDFLAGS -shared -Wl,-soname,$1 -o $* -lm
- rm -f $library.so
- ln -s $1 $library.so
+ if [ -f $file ]; then

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