Attachment #343358 for bug #463418




++ b/panels/common/Makefile.am
-- a/panels/common/Makefile.am

	$(LIBLANGUAGE_CFLAGS)				\
	-DDATADIR=\""$(datadir)"\"			\
	-DUIDIR=\""$(pkgdatadir)/ui"\"			\
	-DLIBLOCALEDIR=\""$(libdir)/locale"\"       \
	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"

++ b/panels/datetime/Makefile.am

	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
	-DDATADIR="\"$(uidir)\""			\
	-DREALDATADIR="\"$(datadir)\""			\
	$(NULL)

noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
++ b/panels/datetime/test-endianess.c

		return 0;
	}

	dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
	if (dir == NULL) {
		/* Try with /usr/share/locale/
		 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
		dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
		if (dir == NULL) {
			return 1;
		}
++ b/panels/datetime/test-timezone.c

#include <gtk/gtk.h>
#include "cc-timezone-map.h"

#define TZ_DIR REALDATADIR "/zoneinfo/"

static GList *
get_timezone_list (GList *tzs,
++ b/panels/datetime/tz.h

#include <glib.h>

#ifndef __sun
#  define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
#else
#  define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
#endif

typedef struct _TzDB TzDB;
++ b/panels/printers/Makefile.am

	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
	-DDATADIR="\"$(uidir)\""			\
	-DREALDATADIR="\"$(datadir)\""			\
	-DPREFIX="\"$(prefix)\""			\
	-DLIBEXECDIR="\"$(libexecdir)\""			\
	$(NULL)

ccpanelsdir = $(PANELS_DIR)
++ b/panels/printers/cc-printers-panel.c


  if (printer_name)
    {
      const gchar  *const dirs[] = { REALDATADIR "/cups",
                                     PREFIX "/local/share/cups",
                                     NULL };
      const gchar  *testprint[] = { "%s/data/testprint",
                                    "%s/data/testprint.ps",
++ b/panels/printers/pp-host.c

  data->devices->devices = NULL;

  argv = g_new0 (gchar *, 3);
  argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
  argv[1] = g_strdup (priv->hostname);

  /* Use SNMP to get printer's informations */
++ b/panels/user-accounts/Makefile.am

AM_CPPFLAGS =						\
	-DDATADIR=\""$(datadir)"\"			\
	-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\"	\
	-DLIBLOCALEDIR=\""$(libdir)/locale"\"       \
	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"	\
	-I$(srcdir)/../common/				\
- 

Return to bug 463418

Line Link Here

(-)file_not_specified_in_diff (-21 / +23 lines)
0	--	0	++ b/panels/common/Makefile.am
1	-- a/panels/common/Makefile.am
Lines 9-15 Link Here
9	$(LIBLANGUAGE_CFLAGS) \	9	$(LIBLANGUAGE_CFLAGS) \
10	-DDATADIR=\""$(datadir)"\" \	10	-DDATADIR=\""$(datadir)"\" \
11	-DUIDIR=\""$(pkgdatadir)/ui"\" \	11	-DUIDIR=\""$(pkgdatadir)/ui"\" \
12	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \	12	-DLIBLOCALEDIR=\""$(libdir)/locale"\" \
13	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \	13	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
14	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"	14	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"
15		15
16	-- a/panels/datetime/Makefile.am	16	++ b/panels/datetime/Makefile.am
Lines 72-77 Link Here
72	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \	72	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
73	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \	73	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
74	-DDATADIR="\"$(uidir)\"" \	74	-DDATADIR="\"$(uidir)\"" \
		75	-DREALDATADIR="\"$(datadir)\"" \
75	$(NULL)	76	$(NULL)
76		77
77	noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone	78	noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
78	-- a/panels/datetime/test-endianess.c	79	++ b/panels/datetime/test-endianess.c
Lines 38-48 Link Here
38	return 0;	38	return 0;
39	}	39	}
40		40
41	dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);	41	dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
42	if (dir == NULL) {	42	if (dir == NULL) {
43	/* Try with /usr/share/locale/	43	/* Try with /usr/share/locale/
44	* https://bugzilla.gnome.org/show_bug.cgi?id=646780 */	44	* https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
45	dir = g_dir_open ("/usr/share/locale/", 0, NULL);	45	dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
46	if (dir == NULL) {	46	if (dir == NULL) {
47	return 1;	47	return 1;
48	}	48	}
49	-- a/panels/datetime/test-timezone.c	49	++ b/panels/datetime/test-timezone.c
Lines 1-7 Link Here
1	#include <gtk/gtk.h>	1	#include <gtk/gtk.h>
2	#include "cc-timezone-map.h"	2	#include "cc-timezone-map.h"
3		3
4	#define TZ_DIR "/usr/share/zoneinfo/"	4	#define TZ_DIR REALDATADIR "/zoneinfo/"
5		5
6	static GList *	6	static GList *
7	get_timezone_list (GList *tzs,	7	get_timezone_list (GList *tzs,
8	-- a/panels/datetime/tz.h	8	++ b/panels/datetime/tz.h
Lines 29-37 Link Here
29	#include <glib.h>	29	#include <glib.h>
30		30
31	#ifndef __sun	31	#ifndef __sun
32	# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"	32	# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
33	#else	33	#else
34	# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"	34	# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
35	#endif	35	#endif
36		36
37	typedef struct _TzDB TzDB;	37	typedef struct _TzDB TzDB;
38	-- a/panels/printers/Makefile.am	38	++ b/panels/printers/Makefile.am
Lines 12-17 Link Here
12	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \	12	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
13	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \	13	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
14	-DDATADIR="\"$(uidir)\"" \	14	-DDATADIR="\"$(uidir)\"" \
		15	-DREALDATADIR="\"$(datadir)\"" \
		16	-DPREFIX="\"$(prefix)\"" \
		17	-DLIBEXECDIR="\"$(libexecdir)\"" \
15	$(NULL)	18	$(NULL)
16		19
17	ccpanelsdir = $(PANELS_DIR)	20	ccpanelsdir = $(PANELS_DIR)
18	-- a/panels/printers/cc-printers-panel.c	21	++ b/panels/printers/cc-printers-panel.c
Lines 2199-2206 Link Here
2199		2199
2200	if (printer_name)	2200	if (printer_name)
2201	{	2201	{
2202	const gchar *const dirs[] = { "/usr/share/cups",	2202	const gchar *const dirs[] = { REALDATADIR "/cups",
2203	"/usr/local/share/cups",	2203	PREFIX "/local/share/cups",
2204	NULL };	2204	NULL };
2205	const gchar *testprint[] = { "%s/data/testprint",	2205	const gchar *testprint[] = { "%s/data/testprint",
2206	"%s/data/testprint.ps",	2206	"%s/data/testprint.ps",
2207	-- a/panels/printers/pp-host.c	2207	++ b/panels/printers/pp-host.c
Lines 251-257 Link Here
251	data->devices->devices = NULL;	251	data->devices->devices = NULL;
252		252
253	argv = g_new0 (gchar *, 3);	253	argv = g_new0 (gchar *, 3);
254	argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");	254	argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
255	argv[1] = g_strdup (priv->hostname);	255	argv[1] = g_strdup (priv->hostname);
256		256
257	/* Use SNMP to get printer's informations */	257	/* Use SNMP to get printer's informations */
258	-- a/panels/user-accounts/Makefile.am	258	++ b/panels/user-accounts/Makefile.am
Lines 10-16 Link Here
10	AM_CPPFLAGS = \	10	AM_CPPFLAGS = \
11	-DDATADIR=\""$(datadir)"\" \	11	-DDATADIR=\""$(datadir)"\" \
12	-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \	12	-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \
13	-DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \	13	-DLIBLOCALEDIR=\""$(libdir)/locale"\" \
14	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \	14	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
15	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \	15	-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
16	-I$(srcdir)/../common/ \	16	-I$(srcdir)/../common/ \
17	-