From 961f08cd6233ea0f2273a55a6aa5206cac50a732 Mon Sep 17 00:00:00 2001 From: jacob berkman Date: Tue, 18 Jun 2002 19:29:45 +0000 Subject: [PATCH] fixup localedir to work with solaris gettext (fixes bug #83616) 2002-06-18 jacob berkman * 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) --- ChangeLog | 11 +++++++++++ archiver/Makefile.am | 2 +- capplets/common/Makefile.am | 2 +- configure.in | 2 +- control-center/Makefile.am | 4 ++-- libbackground/Makefile.am | 3 +-- libwindow-settings/Makefile.am | 2 +- root-manager/Makefile.am | 2 +- 8 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 809d4a47a..190c82299 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2002-06-18 jacob berkman + + * 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 * Release 2.0.0 diff --git a/archiver/Makefile.am b/archiver/Makefile.am index 80d8717b7..bf35ee478 100644 --- a/archiver/Makefile.am +++ b/archiver/Makefile.am @@ -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)"\" \ diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am index eaf48c1ba..6cdc0191e 100644 --- a/capplets/common/Makefile.am +++ b/capplets/common/Makefile.am @@ -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)/ \ diff --git a/configure.in b/configure.in index 569ce8058..0f5de9124 100644 --- a/configure.in +++ b/configure.in @@ -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}" diff --git a/control-center/Makefile.am b/control-center/Makefile.am index 18b164780..c39d4da64 100644 --- a/control-center/Makefile.am +++ b/control-center/Makefile.am @@ -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)"\" \ diff --git a/libbackground/Makefile.am b/libbackground/Makefile.am index 2382c6292..b174592c5 100644 --- a/libbackground/Makefile.am +++ b/libbackground/Makefile.am @@ -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 - diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am index 8fe70a222..b82d32728 100644 --- a/libwindow-settings/Makefile.am +++ b/libwindow-settings/Makefile.am @@ -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"\" \ diff --git a/root-manager/Makefile.am b/root-manager/Makefile.am index da1bb4b35..ddf0ce49c 100644 --- a/root-manager/Makefile.am +++ b/root-manager/Makefile.am @@ -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"\" \