applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix localedir defines. Bug #395383.

Browse source 
2007-01-31  Christian Persch  <chpe@svn.gnome.org>

	* capplets/accessibility/at-properties/Makefile.am:
	* capplets/accessibility/keyboard/Makefile.am:
	* capplets/background/Makefile.am:
	* capplets/common/Makefile.am:
	* capplets/default-applications/Makefile.am:
	* capplets/display/Makefile.am:
	* capplets/font/Makefile.am:
	* capplets/keybindings/Makefile.am:
	* capplets/keyboard/Makefile.am:
	* capplets/mouse/Makefile.am:
	* capplets/network/Makefile.am:
	* capplets/theme-switcher/Makefile.am:
	* capplets/ui-properties/Makefile.am:
	* capplets/windows/Makefile.am:
	* configure.in:
	* gnome-settings-daemon/Makefile.am:
	* libbackground/Makefile.am:
	* libwindow-settings/Makefile.am:
	* typing-break/Makefile.am:
	* vfs-methods/fontilus/Makefile.am:
	* vfs-methods/themus/Makefile.am: Fix localedir defines. Bug #395383.

svn path=/trunk/; revision=7219
This commit is contained in:
Christian Persch 2007-01-31 21:09:43 +00:00 • committed by Christian Persch
parent 413ec80cd2
commit c19d6d800d
22 changed files with 61 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

3
capplets/accessibility/at-properties/Makefile.am
View file

@ -24,6 +24,7 @@ glade_DATA = at-enable-dialog.glade
INCLUDES = $(AT_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \
-DPIXMAPDIR=\""$(pixmapdir)"\"
-DPIXMAPDIR=\""$(pixmapdir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)

2
capplets/accessibility/keyboard/Makefile.am
View file

@ -30,7 +30,7 @@ desktopdir = $(datadir)/applications
Desktop_in_files = accessibility-keyboard.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA)

1
capplets/background/Makefile.am
View file

@ -2,6 +2,7 @@ WALLPAPER_DATADIR = $(datadir)/gnome-background-properties
INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DWALLPAPER_DATADIR=\""$(WALLPAPER_DATADIR)"\"
bin_PROGRAMS = gnome-background-properties

2
capplets/common/Makefile.am
View file

@ -1,7 +1,7 @@
EXTRA_DIST = ChangeLog wrapper-script.in Bonobo_Control_Capplet_generic.oaf.in
INCLUDES = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"capplet-common\" \
-DINSTALL_PREFIX=\"$(prefix)\" \

1
capplets/default-applications/Makefile.am
View file

@ -24,6 +24,7 @@ INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \
$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""\
-DDATADIR=\""$(datadir)"\"
noinst_DATA = gnome-default-applications.xml.in

1
capplets/display/Makefile.am
View file

@ -20,6 +20,7 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\"
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)

1
capplets/font/Makefile.am
View file

@ -28,6 +28,7 @@ glade_DATA = font-properties.glade
INCLUDES = $(FONT_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\"
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(glade_DATA) $(pixmap_DATA)

2
capplets/keybindings/Makefile.am
View file

@ -17,7 +17,7 @@ desktopdir = $(datadir)/applications
Desktop_in_files = keybinding.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA)

2
capplets/keyboard/Makefile.am
View file

@ -27,6 +27,6 @@ desktopdir = $(datadir)/applications
Desktop_in_files = keyboard.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBGNOMEKBDUI_CFLAGS)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) $(LIBGNOMEKBDUI_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmaps_DATA)

2
capplets/mouse/Makefile.am
View file

@ -31,6 +31,6 @@ desktopdir = $(datadir)/applications
Desktop_in_files = gnome-settings-mouse.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) $(cursorfont_DATA)

2
capplets/network/Makefile.am
View file

@ -13,6 +13,6 @@ desktopdir = $(datadir)/applications
desktop_in_files = gnome-network-preferences.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(glade_DATA)

5
capplets/theme-switcher/Makefile.am
View file

@ -1,7 +1,5 @@
bin_PROGRAMS = gnome-theme-manager
pixmapdir = $(GNOMECC_PIXMAPS_DIR)
pixmap_DATA = \
theme-thumbnailing.png
@ -49,7 +47,8 @@ INCLUDES = \
-I$(top_srcdir) \
$(METACITY_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\"
-DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xml_files)
EXTRA_DIST = $(glade_DATA) gnome-theme-save-data.c $(pixmap_DATA) $(xml_in_files)

2
capplets/ui-properties/Makefile.am
View file

@ -13,6 +13,6 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
Gladedir = $(GNOMECC_GLADE_DIR)
Glade_DATA = gnome-ui-properties.glade
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA)

1
capplets/windows/Makefile.am
View file

@ -19,6 +19,7 @@ INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \
-I$(top_srcdir)/libwindow-settings \
-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\"
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)