callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AM_GNOME_GETTEXT doesn't use $(datadir)/locale as the locale dir. (It

Browse Source 
uses either $(prefix)/share/locale or $(prefix)/lib/locale.) Cope with
this.

svn path=/trunk/; revision=6141
This commit is contained in:
Dan Winship
2000-10-24 03:09:37 +00:00
parent 0887fc650f
commit faed5f42e4
24 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2000-10-23 Dan Winship <danw@helixcode.com>
* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
* configure.in: set localedir here to use in Makefiles.
(AM_GNOME_GETTEXT doesn't actually always set it to
$(datadir)/locale).
2000-10-23 Christopher James Lahey <clahey@helixcode.com>
* configure.in: Updated the gal check to check for gal 0.2.1.

8
addressbook/ChangeLog
View File

@ -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

2
addressbook/backend/ebook/Makefile.am
View File

@ -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 \

4
addressbook/backend/pas/Makefile.am
View File

@ -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)
EXTRA_DIST = $(LDAP_BACKEND_SOURCES)

2
addressbook/gui/component/Makefile.am
View File

@ -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 = \

2
addressbook/gui/component/select-names/Makefile.am
View File

@ -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

8
calendar/ChangeLog
View File

@ -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

2
calendar/cal-client/Makefile.am
View File

@ -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) \

2
calendar/cal-util/Makefile.am
View File

@ -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 \

2
calendar/gui/Makefile.am
View File

@ -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) \

2
calendar/gui/dialogs/Makefile.am
View File

@ -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

2
calendar/pcs/Makefile.am
View File

@ -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 \

2
configure.in
View File

@ -63,6 +63,8 @@ LIBS=$LIBS_save
ALL_LINGUAS="da de el en_GB es fi fr ga gl hu it ja ko nl nn no pl pt ru sl sv tr uk"
AM_GNOME_GETTEXT
localedir='$(prefix)/$(DATADIRNAME)/locale'
AC_SUBST(localedir)
GNOME_X_CHECKS

6
executive-summary/ChangeLog
View File

@ -1,3 +1,9 @@
2000-10-23 Dan Winship <danw@helixcode.com>
* idl/Makefile.am (INCLUDES):
* evolution-services/Makefile.am (INCLUDES):
* component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
2000-10-14 Ettore Perazzoli <ettore@helixcode.com>
* evolution-executive-summary.oafinfo: Added

2
executive-summary/component/Makefile.am
View File

@ -17,7 +17,7 @@ INCLUDES = \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"evolution-executive-summary\"

2
executive-summary/evolution-services/Makefile.am
View File

@ -13,7 +13,7 @@ INCLUDES = \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"evolution-services\"

2
executive-summary/idl/Makefile.am
View File

@ -10,7 +10,7 @@ INCLUDES = \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"evolution-executive-summary\"

4
mail/ChangeLog
View File

@ -1,3 +1,7 @@
2000-10-23 Dan Winship <danw@helixcode.com>
* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR.
2000-10-23 Jeffrey Stedfast <fejj@helixcode.com>
* mail-ops.c (do_send_mail): Apply outgoing filters to the

2
mail/Makefile.am
View File

@ -21,7 +21,7 @@ INCLUDES = \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
-DG_LOG_DOMAIN=\"evolution-mail\" \

2
notes/Makefile.am
View File

@ -9,7 +9,7 @@ INCLUDES = \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"evolution-notes\"

4
shell/ChangeLog
View File

@ -1,3 +1,7 @@
2000-10-23 Dan Winship <danw@helixcode.com>
* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
2000-10-20 Michael Meeks <michael@helixcode.com>
* evolution-shell-component-client.c

2
shell/Makefile.am
View File

@ -8,7 +8,7 @@ INCLUDES = \
$(EXTRA_GNOME_CFLAGS) \
-DEVOLUTION_IMAGES=\""$(datadir)/images/evolution"\" \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \
-DG_LOG_DOMAIN=\"evolution-shell\"

4
wombat/ChangeLog
View File

@ -1,3 +1,7 @@
2000-10-23 Dan Winship <danw@helixcode.com>
* Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR
2000-09-25 Federico Mena Quintero <federico@helixcode.com>
* Makefile.am (INCLUDES): Add the libical include path.

4
wombat/Makefile.am
View File

@ -8,9 +8,9 @@ INCLUDES = \
-I$(top_srcdir)/calendar/pcs \
-I$(top_srcdir)/libical/src/libical \
$(GNOME_INCLUDEDIR) \
$(BONOBO_VFS_GNOME_CFLAGS) \
$(BONOBO_VFS_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\"
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
bin_PROGRAMS = \
wombat