diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | data/Makefile.am | 7 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2003-03-28 Ettore Perazzoli <ettore@ximian.com> + + * data/Makefile.am (install-data-local): Fix installation of the + .desktop file. + +2003-03-27 Ettore Perazzoli <ettore@ximian.com> + + * configure.in: Add gal-2.0 to the list of packages to determine + WOMBAT_CFLAGS and WOMBAT_LIBS. + 2003-03-26 Ettore Perazzoli <ettore@ximian.com> * configure.in: Autogen help/Makefile. diff --git a/data/Makefile.am b/data/Makefile.am index b89fb62687..98dea62fef 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,6 +1,6 @@ desktopdir = $(datadir)/applications desktop_in_file = evolution.desktop.in -desktop_DATA = $(desktop_in_file:.desktop.in=.desktop) +desktop_file = $(desktop_in_file:.desktop.in=.desktop) @INTLTOOL_DESKTOP_RULE@ keysdir = $(datadir)/mime-info @@ -26,13 +26,14 @@ install-kde-applnk: endif noinst_MANS = evolution.1 +noinst_DATA = $(keys_file) SUBDIRS = cde_app_root install-data-local: install-kde-applnk $(mkinstalldirs) $(DESTDIR)$(desktopdir); \ $(INSTALL_DATA) $(desktop_file) \ - $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; \ + $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop.in=-$(BASE_VERSION).desktop) ; \ $(mkinstalldirs) $(DESTDIR)$(keysdir); \ $(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ; \ $(mkinstalldirs) $(DESTDIR)$(mimedir); \ @@ -53,7 +54,7 @@ dtappunintegrate: endif EXTRA_DIST = \ - $(desktop_DATA) \ + $(desktop_file) \ $(desktop_in_file) \ $(mime_file) \ $(keys_file) \ |