1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From: Youhei SASAKI <uwabami@gfd-dennou.org>
Date: Tue, 31 Jan 2012 13:48:19 +0900
Subject: Add Multiarch Support
Forwarded: not-needed
Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
---
Mkinclude.in | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
--- a/Mkinclude.in
+++ b/Mkinclude.in
@@ -44,8 +44,8 @@
DCLLANG = @DCLLANG@
BINDIR = $(prefix)/bin
-LIBDIR = $(prefix)/lib
-INCDIR = $(prefix)/include
+LIBDIR = $(prefix)/lib/$(DEB_HOST_MULTIARCH)
+INCDIR = $(prefix)/include/dcl
datarootdir = @datarootdir@
MANDIR = @mandir@
@@ -54,7 +54,7 @@
LLIBDIR = $(DCLDIR)/lib
LINCDIR = $(DCLDIR)/include
-DCLLIBNAME = $(DCLLANG)dcl$(DCLVERNUM)
+DCLLIBNAME = $(DCLLANG)dcl
DCLLIBFILE = $(LIBDIR)/lib$(DCLLIBNAME).a
LDCLLIBFILE = $(LLIBDIR)/lib$(DCLLIBNAME).a
DCLSHLIBFILE = $(LIBDIR)/lib$(DCLLIBNAME).@EXTSHLIB@
@@ -98,12 +98,14 @@
MAKE = make
CC = @CC@
DEFS = @DEFS@
-CFLAGS = @CFLAGS@ -fPIC -DGTKVERSION=$(GTKVERSION) $(GTK_CFLAGS) -I$(INCDIR)
+CFLAGS = @CFLAGS@ @CPPFLAGS@ -fPIC -DGTKVERSION=$(GTKVERSION) $(GTK_CFLAGS)
+CPPFLAGS = @CPPFLAGS@
# $(XINCPATH)
-FC = @FC@
+FC = $(shell basename $(shell readlink -f /usr/bin/gfortran))
+FMODDIR = /usr/lib/$(DEB_HOST_MULTIARCH)/fortran/$(FC)
FFLAGS = @FFLAGS@ -fPIC
LD = ld
-LDFLAGS = -I$(INCDIR) $(DCLLIBPATH)
+LDFLAGS = @LDFLAGS@ -I$(INCDIR) -I$(FMODDIR)/dcl $(DCLLIBPATH)
#$(XLIBPATH)
#LDLIBS = $(DCLLIBOPT) $(GTK_LIBS) @X_EXTRA_LIBS@ $(XLIBOPT) @FLIBS@ @LINKOPT@ $(MATHLIBOPT)
LDLIBS = $(DCLLIBOPT) $(GTK_LIBS) @FLIBS@ @LINKOPT@ $(MATHLIBOPT) $(FCLIBOPT)
@@ -142,7 +144,7 @@
OSQARN_EXT = @OSQARN_EXT@
OSGARG_EXT = @OSGARG_EXT@
-# selection of source code of display driver
+# selection of source code of display driver
DRV_EXT = @DRV_EXT@
|
