diff options
| author | Dan Winship <danw@src.gnome.org> | 2000-10-24 11:09:37 +0800 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2000-10-24 11:09:37 +0800 |
| commit | faed5f42e47b263f4b4d01106d4bdec1930c475f (patch) | |
| tree | 4f91dbdebe98a3047401f89c58556934027555dc /calendar | |
| parent | 0887fc650f5b6f37cbbaa84d3edd121fd83ba85d (diff) | |
| download | gsoc2013-evolution-faed5f42e47b263f4b4d01106d4bdec1930c475f.tar.gz gsoc2013-evolution-faed5f42e47b263f4b4d01106d4bdec1930c475f.tar.zst gsoc2013-evolution-faed5f42e47b263f4b4d01106d4bdec1930c475f.zip | |
AM_GNOME_GETTEXT doesn't use $(datadir)/locale as the locale dir. (It
uses either $(prefix)/share/locale or $(prefix)/lib/locale.) Cope with
this.
svn path=/trunk/; revision=6141
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 8 | ||||
| -rw-r--r-- | calendar/cal-client/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/cal-util/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/gui/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/gui/dialogs/Makefile.am | 2 | ||||
| -rw-r--r-- | calendar/pcs/Makefile.am | 2 |
6 files changed, 13 insertions, 5 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 9e8438f2da..03b6968ac8 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,11 @@ +2000-10-23 Dan Winship <danw@helixcode.com> + + * pcs/Makefile.am (INCLUDES): + * gui/dialogs/Makefile.am (INCLUDES): + * gui/Makefile.am (INCLUDES): + * cal-util/Makefile.am (INCLUDES): + * cal-client/Makefile.am (INCLUDES): Update GNOMELOCALEDIR. + 2000-10-23 JP Rosevear <jpr@helixcode.com> * conduits/todo/todo-conduit.h: Use new libeconduit calls and diff --git a/calendar/cal-client/Makefile.am b/calendar/cal-client/Makefile.am index ce968767f5..56757e3946 100644 --- a/calendar/cal-client/Makefile.am +++ b/calendar/cal-client/Makefile.am @@ -17,7 +17,7 @@ $(CORBA_GENERATED): $(idls) $(ORBIT_IDL) $(idl_flags) $(srcdir)/../idl/evolution-calendar.idl INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(localedir)"\" \ -DG_LOG_DOMAIN=\"cal-client\" \ -I$(top_srcdir)/calendar \ -I$(srcdir) -I$(top_srcdir) \ diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am index cedbd84d25..9a1b677e9b 100644 --- a/calendar/cal-util/Makefile.am +++ b/calendar/cal-util/Makefile.am @@ -1,7 +1,7 @@ noinst_PROGRAMS = test-recur INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(localedir)"\" \ -DG_LOG_DOMAIN=\"cal-util\" \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index d886346abb..5376cbc1a6 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -18,7 +18,7 @@ INCLUDES = \ $(EXTRA_GNOME_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + -DGNOMELOCALEDIR=\""$(localedir)"\" LINK_FLAGS = \ $(BONOBO_VFS_GNOME_LIBS) \ diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 98c8be9f97..9b80e03f95 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -10,7 +10,7 @@ INCLUDES = \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ $(BONOBO_VFS_GNOME_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + -DGNOMELOCALEDIR=\""$(localedir)"\" noinst_LIBRARIES = libcal-dialogs.a diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am index b435b90229..5ca12eff6e 100644 --- a/calendar/pcs/Makefile.am +++ b/calendar/pcs/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = \ -I$(top_srcdir)/libical/src/libical \ -I$(top_builddir)/libical/src/libical \ $(BONOBO_VFS_GNOME_CFLAGS) \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" + -DGNOMELOCALEDIR=\""$(localedir)"\" CORBA_GENERATED = \ evolution-calendar.h \ |