diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:13:09 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:13:09 +0800 |
| commit | 62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15 (patch) | |
| tree | f71998dd545a9d0736a7b1543f6bd5f62ee6fd83 /my-evolution/Makefile.am | |
| parent | cd8eae592e7ad9c2a2bbf34892a5ffb941a7db57 (diff) | |
| download | gsoc2013-evolution-62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15.tar gsoc2013-evolution-62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15.tar.gz gsoc2013-evolution-62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15.tar.bz2 gsoc2013-evolution-62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15.tar.lz gsoc2013-evolution-62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15.tar.xz gsoc2013-evolution-62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15.tar.zst gsoc2013-evolution-62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15.zip | |
Get my-evolution.xml from EVOLUTION_UI_DIRECTORY.
* e-summary-factory.c (control_activate): Get my-evolution.xml
from EVOLUTION_UI_DIRECTORY.
* e-summary.c (e_pixmap_file): Use EVOLUTION_IMAGEDIR.
(e_pixmap_file): Use EVOLUTION_BUTTONSDIR.
* e-summary-weather.c (e_summary_weather_init_locations): Use
LOCATIONDIR.
(e_summary_weather_fill_etable): Likewise.
* Makefile.am (Locationdir): Version using $(BASE_VERSION).
(gladedir): Likewise.
(INCLUDES): Define EVOLUTION_IMAGEDIR.
svn path=/trunk/; revision=19563
Diffstat (limited to 'my-evolution/Makefile.am')
| -rw-r--r-- | my-evolution/Makefile.am | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/my-evolution/Makefile.am b/my-evolution/Makefile.am index 9d05e2503d..b33d0adc94 100644 --- a/my-evolution/Makefile.am +++ b/my-evolution/Makefile.am @@ -1,19 +1,23 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/shell \ - -I$(top_builddir)/shell \ - -I$(top_srcdir)/calendar \ - -I$(top_builddir)/calendar/cal-client \ - -I$(top_srcdir)/libical/src/libical \ - -I$(top_builddir)/libical/src/libical \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ - -DEVOLUTION_DATADIR=\""$(datadir)"\" \ - -DPREFIX=\"$(prefix)\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DLIBDIR=\""$(datadir)"\" \ - -DG_LOG_DOMAIN=\"evolution-executive-summary\" \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/shell \ + -I$(top_builddir)/shell \ + -I$(top_srcdir)/calendar \ + -I$(top_builddir)/calendar/cal-client \ + -I$(top_srcdir)/libical/src/libical \ + -I$(top_builddir)/libical/src/libical \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ + -DEVOLUTION_DATADIR=\""$(datadir)"\" \ + -DEVOLUTION_IMAGEDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images"\" \ + -DEVOLUTION_BUTTONSDIR=\""$(datadir)/evolution-$(BASE_VERSION)/images/buttons"\" \ + -DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \ + -DLOCATIONDIR=\""$(Locationdir)"\" \ + -DPREFIX=\"$(prefix)\" \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DLIBDIR=\""$(datadir)"\" \ + -DG_LOG_DOMAIN=\"evolution-executive-summary\" \ $(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS) IDLS = \ @@ -80,10 +84,9 @@ libevolution_executive_summary_la_SOURCES = $(summary_sources) libevolution_executive_summary_la_LIBADD = $(summary_libs) libevolution_executive_summary_la_LDFLAGS = -module -avoid-version -Locationdir = $(datadir)/evolution +Locationdir = $(datadir)/evolution-$(BASE_VERSION) Location_DATA = Locations - # .server files server_in_files = GNOME_Evolution_Summary.server.in.in @@ -98,7 +101,7 @@ $(server_in_files:.server.in.in=.server.in): $(server_in_files) # Glade -gladedir = $(datadir)/evolution/glade +gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = my-evolution.glade # GConf schemas |