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 /addressbook | |
| 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 'addressbook')
| -rw-r--r-- | addressbook/ChangeLog | 8 | ||||
| -rw-r--r-- | addressbook/backend/ebook/Makefile.am | 2 | ||||
| -rw-r--r-- | addressbook/backend/pas/Makefile.am | 4 | ||||
| -rw-r--r-- | addressbook/gui/component/Makefile.am | 2 | ||||
| -rw-r--r-- | addressbook/gui/component/select-names/Makefile.am | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index 5d5aeff406..903525eaa9 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,11 @@ +2000-10-23 Dan Winship <danw@helixcode.com> + + * gui/component/select-names/Makefile.am (INCLUDES): + * gui/component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR + + * backend/pas/Makefile.am (INCLUDES): + * backend/ebook/Makefile.am (INCLUDES): Update GNOMELOCALEDIR. + 2000-10-23 JP Rosevear <jpr@helixcode.com> * conduit/address-conduit.h: Use new libeconduit calls and diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am index 7f4a4c59fe..7fef103315 100644 --- a/addressbook/backend/ebook/Makefile.am +++ b/addressbook/backend/ebook/Makefile.am @@ -17,7 +17,7 @@ $(CORBA_SOURCE): $(idls) $(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags) INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(localedir)"\" \ -DG_LOG_DOMAIN=\"EBook\" \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/backend \ diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am index 8f4f8a3731..f0a5f79e11 100644 --- a/addressbook/backend/pas/Makefile.am +++ b/addressbook/backend/pas/Makefile.am @@ -13,7 +13,7 @@ $(CORBA_SOURCE): $(idls) $(ORBIT_IDL) $(srcdir)/../idl/addressbook.idl $(idl_flags) INCLUDES = \ - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DGNOMELOCALEDIR=\""$(localedir)"\" \ -DG_LOG_DOMAIN=\"wombat-pas\" \ -I$(top_srcdir) \ -I$(top_srcdir)/addressbook/backend \ @@ -49,4 +49,4 @@ libpas_a_SOURCES = \ BUILT_SOURCES = $(CORBA_SOURCE) CLEANFILES += $(BUILT_SOURCES) -EXTRA_DIST = $(LDAP_BACKEND_SOURCES)
\ No newline at end of file +EXTRA_DIST = $(LDAP_BACKEND_SOURCES) diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 8813504989..ca8e333739 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -19,7 +19,7 @@ INCLUDES = \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" bin_PROGRAMS = \ diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am index ef8d0bf14f..614194fb68 100644 --- a/addressbook/gui/component/select-names/Makefile.am +++ b/addressbook/gui/component/select-names/Makefile.am @@ -39,7 +39,7 @@ INCLUDES = \ -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DCAMEL_PROVIDERDIR=\""$(providerdir)"\" lib_LTLIBRARIES = libeselectnames.la |