| 1 |
--- gcompris-12.05.orig/Makefile.am
|
| 2 |
+++ gcompris-12.05/Makefile.am
|
| 3 |
@@ -17,7 +17,7 @@
|
| 4 |
# endif
|
| 5 |
|
| 6 |
|
| 7 |
-icondir=$(datadir)/pixmaps
|
| 8 |
+icondir=/usr/share/pixmaps
|
| 9 |
icon_DATA = gcompris.png gcompris-edit.png
|
| 10 |
|
| 11 |
if BUILD_MINGW32
|
| 12 |
@@ -25,7 +25,7 @@
|
| 13 |
Applications_in_files =
|
| 14 |
Applications_DATA =
|
| 15 |
else
|
| 16 |
-Applicationsdir = $(datadir)/applications/
|
| 17 |
+Applicationsdir = /usr/share/applications/
|
| 18 |
Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
|
| 19 |
Applications_DATA = gcompris.desktop gcompris-edit.desktop
|
| 20 |
endif
|
| 21 |
--- gcompris-12.05.orig/configure.ac
|
| 22 |
+++ gcompris-12.05/configure.ac
|
| 23 |
@@ -204,10 +204,8 @@
|
| 24 |
USE_DEBUG="$enableval", USE_DEBUG="no")
|
| 25 |
if test "x$USE_DEBUG" == "xyes" ; then
|
| 26 |
AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
|
| 27 |
- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -g"
|
| 28 |
-else
|
| 29 |
- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -O2"
|
| 30 |
fi
|
| 31 |
+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
|
| 32 |
|
| 33 |
dnl disable activation code
|
| 34 |
AC_ARG_ENABLE(disable-activation-code,
|
| 35 |
@@ -338,28 +336,28 @@
|
| 36 |
fi
|
| 37 |
else
|
| 38 |
dnl Set PACKAGE_LOCALE_DIR in config.h.
|
| 39 |
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
|
| 40 |
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
|
| 41 |
|
| 42 |
dnl Set PACKAGE_DATA_DIR
|
| 43 |
PACKAGE_DATA_DIR="boards"
|
| 44 |
AC_SUBST(PACKAGE_DATA_DIR)
|
| 45 |
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
|
| 46 |
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
|
| 47 |
|
| 48 |
dnl Plugin Directory
|
| 49 |
my_libdir=`eval echo "${libdir}"`
|
| 50 |
- AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
|
| 51 |
+ AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
|
| 52 |
plugindir=$libdir/gcompris
|
| 53 |
AC_SUBST(plugindir)
|
| 54 |
|
| 55 |
dnl Python plugin Directory
|
| 56 |
- PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
|
| 57 |
+ PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
|
| 58 |
AC_SUBST(PYTHON_PLUGIN_DIR)
|
| 59 |
|
| 60 |
dnl System GCompris config directory
|
| 61 |
AC_DEFINE_UNQUOTED(SYSTEM_CONFIG_DIR, "/etc", [System GCompris config directory])
|
| 62 |
|
| 63 |
dnl Test for gnuchess
|
| 64 |
- AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/bin:/usr/games:/usr/local/bin:$PATH])
|
| 65 |
+ AC_PATH_PROGS(GNUCHESS, gnuchess gnome-gnuchess, no, [/usr/games/bin:/usr/bin:/usr/games:/usr/local/bin:$PATH])
|
| 66 |
if test x$GNUCHESS = xno; then
|
| 67 |
AC_MSG_ERROR([Couldn't find gnuchess, please install the gnuchess package version]
|
| 68 |
[ 5 or above or define the environment variable GNUCHESS.])
|
| 69 |
--- gcompris-12.05.orig/docs/C/Makefile.am
|
| 70 |
+++ gcompris-12.05/docs/C/Makefile.am
|
| 71 |
@@ -10,7 +10,7 @@
|
| 72 |
overview.dia \
|
| 73 |
$(man_MANS)
|
| 74 |
|
| 75 |
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C
|
| 76 |
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C
|
| 77 |
|
| 78 |
all: $(doc)
|
| 79 |
|
| 80 |
--- gcompris-12.05.orig/docs/eu/Makefile.am
|
| 81 |
+++ gcompris-12.05/docs/eu/Makefile.am
|
| 82 |
@@ -8,7 +8,7 @@
|
| 83 |
overview.dia \
|
| 84 |
gcompris.texi
|
| 85 |
|
| 86 |
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu
|
| 87 |
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu
|
| 88 |
|
| 89 |
all: $(doc)
|
| 90 |
|
| 91 |
--- gcompris-12.05.orig/docs/fr/Makefile.am
|
| 92 |
+++ gcompris-12.05/docs/fr/Makefile.am
|
| 93 |
@@ -8,7 +8,7 @@
|
| 94 |
overview.dia \
|
| 95 |
gcompris.texi
|
| 96 |
|
| 97 |
-gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr
|
| 98 |
+gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr
|
| 99 |
|
| 100 |
all: $(doc)
|
| 101 |
|
| 102 |
--- gcompris-12.05.orig/po/Makefile.in.in
|
| 103 |
+++ gcompris-12.05/po/Makefile.in.in
|
| 104 |
@@ -34,7 +34,7 @@
|
| 105 |
datarootdir = @datarootdir@
|
| 106 |
libdir = @libdir@
|
| 107 |
DATADIRNAME = @DATADIRNAME@
|
| 108 |
-itlocaledir = $(prefix)/$(DATADIRNAME)/locale
|
| 109 |
+itlocaledir = /usr/share/locale
|
| 110 |
subdir = po
|
| 111 |
install_sh = @install_sh@
|
| 112 |
# Automake >= 1.8 provides @mkdir_p@.
|
| 113 |
--- gcompris-12.05.orig/src/gcompris/gcompris.c
|
| 114 |
+++ gcompris-12.05/src/gcompris/gcompris.c
|
| 115 |
@@ -1341,7 +1341,7 @@
|
| 116 |
properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
|
| 117 |
properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
|
| 118 |
NULL);
|
| 119 |
- properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
|
| 120 |
+ properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
|
| 121 |
properties->menu_dir = g_strdup(properties->package_data_dir);
|
| 122 |
g_free(pkg_data_dir);
|
| 123 |
g_free(pkg_clib_dir);
|
Parent Directory
| 
Revision Log