summaryrefslogtreecommitdiff
blob: fe3ef6abc581389b17132f3009b6572c136bab52 (plain)
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
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
diff -ru gcompris-9.5.orig/Makefile.am gcompris-9.5/Makefile.am
--- gcompris-9.5.orig/Makefile.am	2010-04-05 08:57:18.000000000 -0400
+++ gcompris-9.5/Makefile.am	2011-01-06 12:15:53.891564989 -0500
@@ -17,7 +17,7 @@
 # endif
 
 
-icondir=$(datadir)/pixmaps
+icondir=/usr/share/pixmaps
 icon_DATA = gcompris.png gcompris-edit.png
 
 if BUILD_MINGW32
@@ -25,7 +25,7 @@
 Applications_in_files =
 Applications_DATA =
 else
-Applicationsdir = $(datadir)/applications/
+Applicationsdir = /usr/share/applications/
 Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
 Applications_DATA = gcompris.desktop gcompris-edit.desktop
 endif
diff -ru gcompris-9.5.orig/configure.ac gcompris-9.5/configure.ac
--- gcompris-9.5.orig/configure.ac	2010-12-06 15:26:21.000000000 -0500
+++ gcompris-9.5/configure.ac	2011-01-06 12:19:29.657036163 -0500
@@ -203,10 +203,8 @@
           USE_DEBUG="$enableval", USE_DEBUG="no")
 if test "x$USE_DEBUG" == "xyes" ; then
     AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
-    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -g"
-else
-    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -O2"
 fi
+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
 
 dnl disable activation code
 AC_ARG_ENABLE(disable-activation-code,
@@ -337,28 +335,28 @@
   fi
 else
   dnl Set PACKAGE_LOCALE_DIR in config.h.
-  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
 
   dnl Set PACKAGE_DATA_DIR
   PACKAGE_DATA_DIR="boards"
   AC_SUBST(PACKAGE_DATA_DIR)
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
 
   dnl Plugin Directory
   my_libdir=`eval echo "${libdir}"`
-  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
   plugindir=$libdir/gcompris
   AC_SUBST(plugindir)
 
   dnl Python plugin Directory
-  PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
+  PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
   AC_SUBST(PYTHON_PLUGIN_DIR)
 
   dnl System GCompris config directory
   AC_DEFINE_UNQUOTED(SYSTEM_CONFIG_DIR, "/etc", [System GCompris config directory])
 
   dnl Test for gnuchess
-  AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/bin:/usr/games:/usr/local/bin:$PATH])
+  AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/games/bin:/usr/bin:/usr/games:/usr/local/bin:$PATH])
   if test x$GNUCHESS = xno; then
     AC_MSG_ERROR(Couldn't find gnuchess, please install the gnuchess package version 5 or above)
   fi
diff -ru gcompris-9.5.orig/docs/C/Makefile.am gcompris-9.5/docs/C/Makefile.am
--- gcompris-9.5.orig/docs/C/Makefile.am	2009-08-30 12:24:49.000000000 -0400
+++ gcompris-9.5/docs/C/Makefile.am	2011-01-06 12:19:44.308216363 -0500
@@ -10,7 +10,7 @@
 	     overview.dia \
 	     $(man_MANS)
 
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C
 
 all: $(doc)
 
diff -ru gcompris-9.5.orig/docs/eu/Makefile.am gcompris-9.5/docs/eu/Makefile.am
--- gcompris-9.5.orig/docs/eu/Makefile.am	2010-03-23 18:21:41.000000000 -0400
+++ gcompris-9.5/docs/eu/Makefile.am	2011-01-06 12:19:54.444265564 -0500
@@ -8,7 +8,7 @@
 	     overview.dia \
 	     gcompris.texi
 
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu
 
 all: $(doc)
 
diff -ru gcompris-9.5.orig/docs/fr/Makefile.am gcompris-9.5/docs/fr/Makefile.am
--- gcompris-9.5.orig/docs/fr/Makefile.am	2010-03-23 18:21:41.000000000 -0400
+++ gcompris-9.5/docs/fr/Makefile.am	2011-01-06 12:19:59.760242448 -0500
@@ -8,7 +8,7 @@
 	     overview.dia \
 	     gcompris.texi
 
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr
 
 all: $(doc)
 
diff -ru gcompris-9.5.orig/po/Makefile.in.in gcompris-9.5/po/Makefile.in.in
--- gcompris-9.5.orig/po/Makefile.in.in	2010-12-06 15:29:45.000000000 -0500
+++ gcompris-9.5/po/Makefile.in.in	2011-01-06 12:20:28.901633920 -0500
@@ -34,7 +34,7 @@
 datarootdir = @datarootdir@
 libdir = @libdir@
 DATADIRNAME = @DATADIRNAME@
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
+itlocaledir = /usr/share/locale
 subdir = po
 install_sh = @install_sh@
 # Automake >= 1.8 provides @mkdir_p@.
diff -ru gcompris-9.5.orig/src/gcompris/gcompris.c gcompris-9.5/src/gcompris/gcompris.c
--- gcompris-9.5.orig/src/gcompris/gcompris.c	2010-12-05 13:08:35.000000000 -0500
+++ gcompris-9.5/src/gcompris/gcompris.c	2011-01-06 12:21:01.535353344 -0500
@@ -1308,7 +1308,7 @@
     properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
     properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
 							NULL);
-    properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
+    properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
     properties->menu_dir = g_strdup(properties->package_data_dir);
     g_free(pkg_data_dir);
     g_free(pkg_clib_dir);