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
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
From: Youhei SASAKI <uwabami@gfd-dennou.org>
Date: Tue, 31 Jan 2012 13:48:19 +0900
Subject: Add Multiarch Support
Signed-off-by: Youhei SASAKI <uwabami@gfd-dennou.org>
---
Makefile.in | 12 ++++++------
Mkinclude.in | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
mkldir:
@if (test ! -d $(LDBASEDIR)) then \
echo "Making directory $(LDBASEDIR)" ; \
- mkdir $(LDBASEDIR); \
+ mkdir -p $(LDBASEDIR); \
fi
object:
@@ -57,23 +57,23 @@
mkdir:
@if (test ! -d $(prefix)) then \
echo "Making directory $(prefix)" ; \
- mkdir $(prefix) ; \
+ mkdir -p $(prefix) ; \
fi
@if (test ! -d $(LIBDIR)) then \
echo "Making directory $(LIBDIR)" ; \
- mkdir $(LIBDIR) ; \
+ mkdir -p $(LIBDIR) ; \
fi
@if (test ! -d $(BINDIR)) then \
echo "Making directory $(BINDIR)" ; \
- mkdir $(BINDIR) ; \
+ mkdir -p $(BINDIR) ; \
fi
@if (test ! -d $(INCDIR)) then \
echo "Making directory $(INCDIR)" ; \
- mkdir $(INCDIR) ; \
+ mkdir -p $(INCDIR) ; \
fi
@if (test ! -d $(DBASEDIR)) then \
echo "Making directory $(DBASEDIR)" ; \
- mkdir $(DBASEDIR) ; \
+ mkdir -p $(DBASEDIR) ; \
fi
@if (test ! -d $(MANDIR)) then \
echo "Making directory $(MANDIR)" ; \
--- a/Mkinclude.in
+++ b/Mkinclude.in
@@ -44,7 +44,7 @@
DCLLANG = @DCLLANG@
BINDIR = $(prefix)/bin
-LIBDIR = $(prefix)/lib
+LIBDIR = $(prefix)/lib/$(DEB_HOST_MULTIARCH)
INCDIR = $(prefix)/include
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@
@@ -91,12 +91,13 @@
MAKE = make
CC = @CC@
DEFS = @DEFS@
-CFLAGS = @CFLAGS@ -fPIC -DGTKVERSION=$(GTKVERSION) $(GTK_CFLAGS)
+CFLAGS = @CFLAGS@ @CPPFLAGS@ -fPIC -DGTKVERSION=$(GTKVERSION) $(GTK_CFLAGS)
+CPPFLAGS = @CPPFLAGS@
# $(XINCPATH)
FC = @FC@
-FFLAGS = @FFLAGS@ -fPIC
+FFLAGS = $(shell dpkg-buildflags --get FFLAGS) -fPIC
LD = ld
-LDFLAGS = $(DCLLIBPATH)
+LDFLAGS = @LDFLAGS@ $(DCLLIBPATH)
#$(XLIBPATH)
#LDLIBS = $(DCLLIBOPT) $(GTK_LIBS) @X_EXTRA_LIBS@ $(XLIBOPT) @FLIBS@ @LINKOPT@ $(MATHLIBOPT)
LDLIBS = $(DCLLIBOPT) $(GTK_LIBS) @FLIBS@ @LINKOPT@ $(MATHLIBOPT)
|
