Gentoo Attachment #158009 for bug #225883

View | Details | Raw Unified
Collapse All | Expand All

(-) gcompris-8.4.5/Makefile.am (-4 / +2 lines)

Lines 17-23	Link Here

endif

endif

icondir=$(datadir)/pixmaps

icondir=/usr/share/pixmaps

icon_DATA = gcompris.png gcompris-edit.png

icon_DATA = gcompris.png gcompris-edit.png

if BUILD_MINGW32

if BUILD_MINGW32

Lines 29-40	Link Here

Menu_DATA=

Menu_DATA=

else

else

Applicationsdir = $(datadir)/applications/

Applicationsdir = /usr/share/applications

Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in

Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in

Applications_DATA = gcompris.desktop gcompris-edit.desktop

Applications_DATA = gcompris.desktop gcompris-edit.desktop

Menudir=$(prefix)/lib/menu

Menu_DATA=gcompris

endif

endif

@INTLTOOL_DESKTOP_RULE@

@INTLTOOL_DESKTOP_RULE@

(-) gcompris-8.4.5/configure.in (-8 / +6 lines)

Lines 227-236	Link Here

          USE_DEBUG="$enableval", USE_DEBUG="no")

          USE_DEBUG="$enableval", USE_DEBUG="no")

if test "x$USE_DEBUG" == "xyes" ; then

if test "x$USE_DEBUG" == "xyes" ; then

    AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")

    AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")

    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror -g"

else

    CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -Werror"

fi

fi

CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"

dnl WIN32 Specifics

dnl WIN32 Specifics

AC_MSG_CHECKING([for native Win32])

AC_MSG_CHECKING([for native Win32])

Lines 299-323	Link Here

if test "x$platform_win32" = "xno" ; then

if test "x$platform_win32" = "xno" ; then

  dnl Set PACKAGE_LOCALE_DIR in config.h.

  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

  dnl Set PACKAGE_DATA_DIR

  PACKAGE_DATA_DIR="boards"

  PACKAGE_DATA_DIR="boards"

  AC_SUBST(PACKAGE_DATA_DIR)

  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 Set PACKAGE_HELP_DIR

  dnl Set PACKAGE_HELP_DIR

  PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/help"

  PACKAGE_HELP_DIR="${datadir}/${PACKAGE}/help"

  AC_SUBST(PACKAGE_HELP_DIR)

  AC_SUBST(PACKAGE_HELP_DIR)

  dnl Plugin Directory

  dnl Plugin Directory

  my_libdir=`eval echo "${libdir}"`

  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

  plugindir=$libdir/gcompris

  AC_SUBST(plugindir)

  AC_SUBST(plugindir)

  dnl Python plugin Directory

  dnl Python plugin Directory

  PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"

  PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"

  AC_SUBST(PYTHON_PLUGIN_DIR)

  AC_SUBST(PYTHON_PLUGIN_DIR)

  dnl System GCompris config directory

  dnl System GCompris config directory

(-) gcompris-8.4.5/docs/C/Makefile.am (-1 / +1 lines)

Lines 10-16	Link Here

	     overview.dia \

	     overview.dia \

	     $(man_MANS)

	     $(man_MANS)

gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/C

gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/C

all: $(doc)

all: $(doc)

(-) gcompris-8.4.5/docs/eu/Makefile.am (-1 / +1 lines)

Lines 8-14	Link Here

	     overview.dia \

	     overview.dia \

	     gcompris.texi

	     gcompris.texi

gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/eu

gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/eu

all: $(doc)

all: $(doc)

(-) gcompris-8.4.5/docs/fr/Makefile.am (-1 / +1 lines)

Lines 8-14	Link Here

	     overview.dia \

	     overview.dia \

	     gcompris.texi

	     gcompris.texi

gcompris_helpdir = $(datadir)/gnome/help/$(PACKAGE)/fr

gcompris_helpdir = /usr/share/gnome/help/$(PACKAGE)/fr

all: $(doc)

all: $(doc)

(-) gcompris-8.4.5/po/Makefile.in.in (-1 / +1 lines)

Lines 34-40	Link Here

datarootdir = @datarootdir@

datarootdir = @datarootdir@

libdir = @libdir@

libdir = @libdir@

DATADIRNAME = @DATADIRNAME@

DATADIRNAME = @DATADIRNAME@

itlocaledir = $(prefix)/$(DATADIRNAME)/locale

itlocaledir = /usr/share/locale

subdir = po

subdir = po

install_sh = @install_sh@

install_sh = @install_sh@

# Automake >= 1.8 provides @mkdir_p@.

# Automake >= 1.8 provides @mkdir_p@.

(-) gcompris-8.4.5/src/gcompris/gcompris.c (-11 / +6 lines)

Lines 192-198	Link Here

   N_("Config directory location: [$HOME/.config/gcompris]. Alternate is to set $XDG_CONFIG_HOME."), NULL},

   N_("Config directory location: [$HOME/.config/gcompris]. Alternate is to set $XDG_CONFIG_HOME."), NULL},

  {"user-dir",'\0', 0, G_OPTION_ARG_STRING, &popt_user_dir,

  {"user-dir",'\0', 0, G_OPTION_ARG_STRING, &popt_user_dir,

   N_("The location of user directories: [$HOME/My GCompris]"), NULL},

   N_("The location of user directories: [$HOME/MyGCompris]"), NULL},

  {"experimental",'\0', 0, G_OPTION_ARG_NONE, &popt_experimental,

  {"experimental",'\0', 0, G_OPTION_ARG_NONE, &popt_experimental,

   N_("Run the experimental activities"), NULL},

   N_("Run the experimental activities"), NULL},

Lines 1149-1164	Link Here

  else

  else

      gchar *pkg_data_dir = gbr_find_data_dir(PACKAGE_DATA_DIR);

      properties->package_data_dir = g_strconcat("/usr/share/games", "/gcompris/boards", NULL);

      gchar *pkg_clib_dir = gbr_find_lib_dir(PACKAGE_CLIB_DIR);

      properties->package_locale_dir = g_strconcat("/usr/share/locale","",NULL);

      properties->package_plugin_dir = g_strconcat(PACKAGE_CLIB_DIR, "/gcompris", NULL);

      properties->package_data_dir = g_strconcat(pkg_data_dir, "/gcompris/boards", NULL);

      properties->package_python_plugin_dir = g_strconcat("/usr/share/games", "/gcompris/python", NULL);

      properties->package_locale_dir = gbr_find_locale_dir(PACKAGE_LOCALE_DIR);

      properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);

      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);

      g_free(pkg_data_dir);

      g_free(pkg_clib_dir);

  g_free(tmpstr);

  g_free(tmpstr);

  g_free(prefix_dir);

  g_free(prefix_dir);

(-) gcompris-8.4.5/src/gcompris/properties.c (-1 / +1 lines)

Lines 107-113	Link Here

static gchar *

static gchar *

gc_prop_default_user_directory_get ()

gc_prop_default_user_directory_get ()

  char *name = "My GCompris";

  char *name = "MyGCompris";

#ifdef WIN32

#ifdef WIN32

  if ( ! G_WIN32_IS_NT_BASED() ) /* Win9x */

  if ( ! G_WIN32_IS_NT_BASED() ) /* Win9x */

    return g_strconcat("../", name, NULL);

    return g_strconcat("../", name, NULL);

Attachment #158009: 8.4.5 path fixes, plus "$HOME/My GCompris" -> "$HOME/MyGCompris" for bug #225883