merge patched into master
[serna.git] / debian / patches / 0001-Change-make-to-gmake.patch
1 From 66a96b1c52bc98769d45eb2119341f64dc154543 Mon Sep 17 00:00:00 2001
2 From: Joachim Breitner <mail@joachim-breitner.de>
3 Date: Mon, 9 Nov 2009 11:47:44 +0100
4 Subject: Change make to gmake
5
6 ---
7  3rd/defaults.pro            |    2 +-
8  3rd/qt/qt-unix.pro          |    2 +-
9  defaults.pro                |    2 +-
10  serna/app/get_undef_syms.sh |    2 +-
11  4 files changed, 4 insertions(+), 4 deletions(-)
12
13 diff --git a/3rd/defaults.pro b/3rd/defaults.pro
14 index 70fc820..b82c42d 100644
15 --- a/3rd/defaults.pro
16 +++ b/3rd/defaults.pro
17 @@ -15,7 +15,7 @@ unix:TMAKE_RANLIB   = ranlib
18  unix:TMAKE_LIBS     *= -L/usr/local/lib
19  
20  unix:PACKAGE_CONFIGURE  = ./configure
21 -unix:MAKE               = gmake
22 +unix:MAKE               = make
23  
24  static:UNIX_LIB_EXT     = .a
25  dynamic:UNIX_LIB_EXT    = .so
26 diff --git a/3rd/qt/qt-unix.pro b/3rd/qt/qt-unix.pro
27 index 2c92e65..9dc01cc 100644
28 --- a/3rd/qt/qt-unix.pro
29 +++ b/3rd/qt/qt-unix.pro
30 @@ -2,7 +2,7 @@
31  #
32  
33  PACKAGE_CONFIGURE   = ./configure
34 -PACKAGE_MAKE        = gmake
35 +PACKAGE_MAKE        = make
36  PACKAGE_MAKEFILE    = Makefile
37  PACKAGE_MAKEFILEOPT = -f
38  PACKAGE_CLEANOPTS   = clean
39 diff --git a/defaults.pro b/defaults.pro
40 index 6e8fcc7..6297df9 100644
41 --- a/defaults.pro
42 +++ b/defaults.pro
43 @@ -56,7 +56,7 @@ linux:DEFINES *= __STDC_VERSION__=199901L
44  unix:TMAKE_RANLIB   = ranlib
45  unix:TMAKE_LIBS     *= -L/usr/local/lib
46  darwin:TMAKE_LIBS   -= -L/usr/local/lib
47 -unix:MAKE            = gmake
48 +unix:MAKE            = make
49  unix:COPY            = cp
50  unix:BISON           = bison
51  unix:TMAKE_CXXFLAGS  += -g
52 diff --git a/serna/app/get_undef_syms.sh b/serna/app/get_undef_syms.sh
53 index b1d4ee0..0c8740d 100755
54 --- a/serna/app/get_undef_syms.sh
55 +++ b/serna/app/get_undef_syms.sh
56 @@ -80,7 +80,7 @@ save_libs $plugin
57  
58  cd ${plugin_dir}
59  COLLECT_NO_DEMANGLE=Y; export COLLECT_NO_DEMANGLE
60 -gmake LD_SHLIB_UNDEF="${LD_NOUNDEF}" ${TARGET} 2>&1 | cat > ${OUTFILE}
61 +make LD_SHLIB_UNDEF="${LD_NOUNDEF}" ${TARGET} 2>&1 | cat > ${OUTFILE}
62  RC=1
63  if ${GREP} -q "${UNDEF_ERRMSG}" ${OUTFILE}; then 
64      RC=0
65 -- 
66 1.6.6
67