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

fixup localedir to work with solaris gettext (fixes bug #83616)

Browse source 
2002-06-18  jacob berkman  <jacob@ximian.com>

	* configure.in:
	* archiver/Makefile.am:
	* capplets/common/Makefile.am:
	* control-center/Makefile.am:
	* libbackground/Makefile.am:
	* libwindow-settings/Makefile.am:
	* root-manager/Makefile.am: fixup localedir to work with solaris
	gettext (fixes bug #83616)
This commit is contained in:
jacob berkman 2002-06-18 19:29:45 +00:00 • committed by Jacob Berkman
parent b4995826e8
commit 961f08cd62
8 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2002-06-18 jacob berkman <jacob@ximian.com>
* configure.in:
* archiver/Makefile.am:
* capplets/common/Makefile.am:
* control-center/Makefile.am:
* libbackground/Makefile.am:
* libwindow-settings/Makefile.am:
* root-manager/Makefile.am: fixup localedir to work with solaris
gettext (fixes bug #83616)
2002-06-17 Jody Goldberg <jody@gnome.org>
* Release 2.0.0

2
archiver/Makefile.am
View file

@ -7,7 +7,7 @@ Locationmeta_DATA = default-user.xml default-global.xml
includedir = $(prefix)/include/config-archiver
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-I$(includedir) \
$(GNOME_INCLUDEDIR) \
-DVERSION=\""$(VERSION)"\" \

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=\""$(datadir)/locale"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"capplet-common\" \
-I$(top_srcdir)/ \

2
configure.in
View file

@ -99,7 +99,7 @@ dnl ==============================================
COMMON_CFLAGS="-I\$(top_srcdir)/capplets/common"
COMMON_LIBS="\$(top_builddir)/capplets/common/libcommon.la"
EXTRA_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\" -DGNOMELOCALEDIR=\"\\\"${datadir}/locale\\\"\""
EXTRA_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-properties\\\"\" -DGNOMELOCALEDIR=\"\\\"${prefix}/${DATADIRNAME}/locale\\\"\""
GNOMECC_CAPPLETS_CFLAGS="${CAPPLET_CFLAGS} ${EXTRA_CFLAGS} ${COMMON_CFLAGS}"
GNOMECC_CAPPLETS_LIBS="${CAPPLET_LIBS} ${COMMON_LIBS}"

4
control-center/Makefile.am
View file

@ -17,8 +17,8 @@ uidir = $(datadir)/gnome-2.0/ui
ui_DATA = gnomecc-ui.xml
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DSETTINGS_DIR=\""$(GNOMECC_DESKTOP_DIR)"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DSETTINGS_DIR=\""$(GNOMECC_DESKTOP_DIR)"\" \
-DPIXMAPS_DIR=\""$(appicondir)"\" \
-DART_DIR=\""$(splashdir)"\" \
-DGNOME_SBINDIR=\""$(sbindir)"\" \

3
libbackground/Makefile.am
View file

@ -1,7 +1,7 @@
EXTRA_DIST = ChangeLog
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \
-DG_LOG_DOMAIN=\"capplet-common\" \
-I$(top_srcdir)/ \
@ -13,4 +13,3 @@ libbackground_la_SOURCES = \
applier.c applier.h \
preferences.c preferences.h \
preview-file-selection.c preview-file-selection.h

2
libwindow-settings/Makefile.am
View file

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

2
root-manager/Makefile.am
View file

@ -2,7 +2,7 @@ pixmapdir = $(datadir)/pixmaps
pixmap_DATA = xst-keys.png
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
@RMHELPER_CFLAGS@ \
-DUH_PATH=\""$(sbindir)/root-manager"\" \
-DUH_KEY_PIXMAP_PATH=\""$(pixmapdir)/xst-keys.png"\" \