diff options
| author | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:25:15 +0800 |
|---|---|---|
| committer | Ettore Perazzoli <ettore@src.gnome.org> | 2003-01-23 04:25:15 +0800 |
| commit | 9d14474e02c1064bc58f29376565a2446c99f99c (patch) | |
| tree | deb8a7e397feee1e102770841e1800f90c6e6d3c /shell/importer | |
| parent | 62e341e4c53d9d28e9ec5ffadfa56a1f1947ae15 (diff) | |
| download | gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.gz gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.bz2 gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.lz gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.xz gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.tar.zst gsoc2013-evolution-9d14474e02c1064bc58f29376565a2446c99f99c.zip | |
Install the shell executable as evolution-$(BASE_VERSION) using an
* Makefile.am: Install the shell executable as
evolution-$(BASE_VERSION) using an install-exec-local hack. Also
put libeshell in $(privlibdir) instead of $(libdir).
(eshellincludedir): Version using $(BASE_VERSION).
(INCLUDES): Update for the new locations of things.
(etspecdir): Likewise.
* e-shell-view.c (e_shell_view_construct): Get evolution.xml from
EVOLUTION_UIDIR.
* importer/Makefile.am: Install libevolution-importer in
$(privlibdir) instead of $(libdir).
(INCLUDES): Updated for the new versioned paths. Define
EVOLUTION_UIDIR.
(libevolution_importerincludedir): Version using $(BASE_VERSION).
(gladedir): Likewise.
* glade/Makefile.am (gladedir): Version using $(BASE_VERSION).
* e-setup.c (DEFAULT_USER_PATH): New #define.
(check_evolution_directory): Use it.
(copy_default_stuff): Likewise. Also, remove old shortcuts.xml
removal cruft.
svn path=/trunk/; revision=19565
Diffstat (limited to 'shell/importer')
| -rw-r--r-- | shell/importer/Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am index 6084f4577d..d0fff6253e 100644 --- a/shell/importer/Makefile.am +++ b/shell/importer/Makefile.am @@ -1,13 +1,13 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/shell \ - -I$(top_builddir)/shell \ - -I$(includedir) \ - -DG_LOG_DOMAIN=\"Evolution-Importer\" \ - -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution/glade\" \ +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/shell \ + -I$(top_builddir)/shell \ + -I$(includedir) \ + -DG_LOG_DOMAIN=\"Evolution-Importer\" \ + -DEVOLUTION_GLADEDIR=\"$(datadir)/evolution-$(BASE_VERSION)/glade\" \ $(SHELL_CFLAGS) -lib_LTLIBRARIES = libevolution-importer.la +privlib_LTLIBRARIES = libevolution-importer.la IDLS = GNOME_Evolution_Importer.idl @@ -25,7 +25,7 @@ $(IDL_GENERATED): $(IDLS) idl_DATA = $(IDLS) -libevolution_importerincludedir = $(includedir)/evolution/importer +libevolution_importerincludedir = $(includedir)/evolution-$(BASE_VERSION)/importer libevolution_importer_la_SOURCES = \ $(IDL_GENERATED) \ evolution-intelligent-importer.c \ @@ -46,7 +46,7 @@ libevolution_importer_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(SHELL_LIBS) -gladedir = $(datadir)/evolution/glade +gladedir = $(datadir)/evolution-$(BASE_VERSION)/glade glade_DATA = import.glade EXTRA_DIST = $(glade_DATA) $(IDLS) |