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
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ChangeLog
View file

@ -1,3 +1,27 @@
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.
2007-01-30 Jens Granseuer <jensgr@gmx.net> 2007-01-30 Jens Granseuer <jensgr@gmx.net>
* configure.in: dump remnants of gstreamer-0.8 since it's not been * configure.in: dump remnants of gstreamer-0.8 since it's not been

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

@ -24,6 +24,7 @@ glade_DATA = at-enable-dialog.glade
INCLUDES = $(AT_CAPPLET_CFLAGS) \ INCLUDES = $(AT_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DPIXMAPDIR=\""$(pixmapdir)"\" -DPIXMAPDIR=\""$(pixmapdir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(glade_DATA) $(pixmap_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_in_files = accessibility-keyboard.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) 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) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmap_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 = \ INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DWALLPAPER_DATADIR=\""$(WALLPAPER_DATADIR)"\" -DWALLPAPER_DATADIR=\""$(WALLPAPER_DATADIR)"\"
bin_PROGRAMS = gnome-background-properties 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 EXTRA_DIST = ChangeLog wrapper-script.in Bonobo_Control_Capplet_generic.oaf.in
INCLUDES = \ INCLUDES = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"capplet-common\" \ -DG_LOG_DOMAIN=\"capplet-common\" \
-DINSTALL_PREFIX=\"$(prefix)\" \ -DINSTALL_PREFIX=\"$(prefix)\" \

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

@ -24,6 +24,7 @@ INCLUDES = \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
$(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \ $(DEFAULT_APPLICATIONS_CAPPLET_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""\
-DDATADIR=\""$(datadir)"\" -DDATADIR=\""$(datadir)"\"
noinst_DATA = gnome-default-applications.xml.in 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) \ INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\" -DPIXMAPDIR=\""$(pixmapdir)"\"
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) 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) \ INCLUDES = $(FONT_CAPPLET_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\" -DPIXMAPDIR=\""$(pixmapdir)"\"
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(glade_DATA) $(pixmap_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_in_files = keybinding.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) 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) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_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_in_files = keyboard.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) 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) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmaps_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_in_files = gnome-settings-mouse.desktop.in
desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) 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) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_DATA) $(pixmap_DATA) $(cursorfont_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_in_files = gnome-network-preferences.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) 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) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(glade_DATA) EXTRA_DIST = $(glade_DATA)

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

@ -1,7 +1,5 @@
bin_PROGRAMS = gnome-theme-manager bin_PROGRAMS = gnome-theme-manager
pixmapdir = $(GNOMECC_PIXMAPS_DIR) pixmapdir = $(GNOMECC_PIXMAPS_DIR)
pixmap_DATA = \ pixmap_DATA = \
theme-thumbnailing.png theme-thumbnailing.png
@ -49,7 +47,8 @@ INCLUDES = \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(METACITY_CFLAGS) \ $(METACITY_CFLAGS) \
$(GNOMECC_CAPPLETS_CFLAGS) \ $(GNOMECC_CAPPLETS_CFLAGS) \
-DGLADEDIR=\""$(gladedir)"\" -DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\""
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xml_files) 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) 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) Gladedir = $(GNOMECC_GLADE_DIR)
Glade_DATA = gnome-ui-properties.glade 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) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)
EXTRA_DIST = $(Glade_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 \ -I$(top_srcdir)/libwindow-settings \
-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \
-DGLADEDIR=\""$(gladedir)"\" \ -DGLADEDIR=\""$(gladedir)"\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DPIXMAPDIR=\""$(pixmapdir)"\" -DPIXMAPDIR=\""$(pixmapdir)"\"
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA)

11
configure.in
View file

@ -5,13 +5,9 @@ AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([shell]) AC_CONFIG_SRCDIR([shell])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])
GNOME_COMPILE_WARNINGS
AC_ISC_POSIX AC_ISC_POSIX
AC_PROG_CC AC_PROG_CC
AC_STDC_HEADERS AC_STDC_HEADERS
@ -47,7 +43,10 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
AM_GLIB_GNU_GETTEXT AM_GLIB_GNU_GETTEXT
GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR) GNOME_COMMON_INIT
GNOME_DEBUG_CHECK
GNOME_COMPILE_WARNINGS([maximum])
GNOME_MAINTAINER_MODE_DEFINES
AC_CHECK_FUNCS(usleep) AC_CHECK_FUNCS(usleep)
AC_CHECK_FUNCS(putenv) AC_CHECK_FUNCS(putenv)

1
gnome-settings-daemon/Makefile.am
View file

@ -3,6 +3,7 @@ SUBDIRS = xrdb actions
INCLUDES=$(DBUS_CFLAGS) $(LIBGNOMEKBD_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \ INCLUDES=$(DBUS_CFLAGS) $(LIBGNOMEKBD_CFLAGS) $(GNOME_SETTINGS_DAEMON_CFLAGS) -I$(top_srcdir)/libbackground -I$(top_srcdir) \
-DDATADIR="\"$(datadir)\"" \ -DDATADIR="\"$(datadir)\"" \
-DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\"" \ -DPIXMAPSDIR="\"$(GNOMECC_PIXMAPS_DIR)\"" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
$(FB_CFLAGS) $(FB_CFLAGS)
libexec_PROGRAMS=gnome-settings-daemon libexec_PROGRAMS=gnome-settings-daemon

1
libbackground/Makefile.am
View file

@ -2,6 +2,7 @@ EXTRA_DIST = ChangeLog
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"capplet-common\" \ -DG_LOG_DOMAIN=\"capplet-common\" \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \
@CAPPLET_CFLAGS@ @CAPPLET_CFLAGS@

4
libwindow-settings/Makefile.am
View file

@ -1,8 +1,8 @@
WM_MODULE_DIR=$(libdir)/window-manager-settings WM_MODULE_DIR=$(libdir)/window-manager-settings
INCLUDES = \ INCLUDES = \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \
-DG_LOG_DOMAIN=\"capplet-common\" \ -DG_LOG_DOMAIN=\"capplet-common\" \
-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \
-I$(top_srcdir)/ \ -I$(top_srcdir)/ \

12
typing-break/Makefile.am
View file

@ -1,7 +1,3 @@
INCLUDES = \
@GNOME_CFLAGS@ \
-DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\"
bin_PROGRAMS = gnome-typing-monitor bin_PROGRAMS = gnome-typing-monitor
gnome_typing_monitor_SOURCES = \ gnome_typing_monitor_SOURCES = \
@ -17,6 +13,14 @@ gnome_typing_monitor_SOURCES = \
drw-selection.c \ drw-selection.c \
drw-selection.h drw-selection.h
gnome_typing_monitor_CPPFLAGS = \
-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-DIMAGEDIR=\"$(GNOMECC_PIXMAPS_DIR)\" \
$(AM_CPPFLAGS)
gnome_typing_monitor_CFLAGS = \
@GNOME_CFLAGS@ \
$(AM_CFLAGS)
gnome_typing_monitor_LDADD = @GNOME_LIBS@ @SCREENSAVER_LIBS@ gnome_typing_monitor_LDADD = @GNOME_LIBS@ @SCREENSAVER_LIBS@
gnome_typing_monitor_LDFLAGS = -export-dynamic gnome_typing_monitor_LDFLAGS = -export-dynamic

3
vfs-methods/fontilus/Makefile.am
View file

@ -1,6 +1,7 @@
INCLUDES = $(FONT_METHOD_CFLAGS) $(FONT_THUMBNAILER_CFLAGS) $(FONT_VIEW_CFLAGS) \ INCLUDES = $(FONT_METHOD_CFLAGS) $(FONT_THUMBNAILER_CFLAGS) $(FONT_VIEW_CFLAGS) \
$(FONT_CONTEXT_MENU_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" $(FONT_CONTEXT_MENU_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules vfsmoduledir = $(libdir)/gnome-vfs-2.0/modules
vfsmodule_LTLIBRARIES = libfont-method.la vfsmodule_LTLIBRARIES = libfont-method.la

3
vfs-methods/themus/Makefile.am
View file

@ -5,7 +5,8 @@ INCLUDES = $(THEME_METHOD_CFLAGS) \
-I$(top_srcdir)/capplets/common \ -I$(top_srcdir)/capplets/common \
-DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \ -DGNOMECC_GLADE_DIR=\"$(GNOMECC_GLADE_DIR)\" \
-DDIRECTORY_DIR=\"$(directorydir)\" \ -DDIRECTORY_DIR=\"$(directorydir)\" \
-DDATA_DIR=\"$(datadir)/themus\" -DDATA_DIR=\"$(datadir)/themus\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = gnome-theme-thumbnailer themus-theme-applier bin_PROGRAMS = gnome-theme-thumbnailer themus-theme-applier