aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@linux.intel.com>2010-03-07 00:27:07 +0800
committerRoss Burton <ross@linux.intel.com>2010-03-16 20:24:55 +0800
commitbb2bd0655853ce4002b85abc7333330fb0c7cfa6 (patch)
treef4a47aed35be00386018ec527fcd58763e103109
parent87e865a9473cb2c7360f9122706c414d69a044f9 (diff)
downloadgsoc2013-evolution-bb2bd0655853ce4002b85abc7333330fb0c7cfa6.tar
gsoc2013-evolution-bb2bd0655853ce4002b85abc7333330fb0c7cfa6.tar.gz
gsoc2013-evolution-bb2bd0655853ce4002b85abc7333330fb0c7cfa6.tar.bz2
gsoc2013-evolution-bb2bd0655853ce4002b85abc7333330fb0c7cfa6.tar.lz
gsoc2013-evolution-bb2bd0655853ce4002b85abc7333330fb0c7cfa6.tar.xz
gsoc2013-evolution-bb2bd0655853ce4002b85abc7333330fb0c7cfa6.tar.zst
gsoc2013-evolution-bb2bd0655853ce4002b85abc7333330fb0c7cfa6.zip
Clean up data/Makefile.am
-rw-r--r--data/Makefile.am49
1 files changed, 10 insertions, 39 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 3c35078826..9dcfd7b94b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,9 @@
+SUBDIRS = icons
+
desktopdir = $(datadir)/applications
desktop_in_in_file = evolution.desktop.in.in \
evolution-settings.desktop.in.in
-desktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
+desktop_DATA = $(desktop_in_in_file:.desktop.in.in=.desktop)
%.desktop.in: %.desktop.in.in
sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" -e "s|\@DATASERVER_EXEC_VERSION\@|$(DATASERVER_EXEC_VERSION)|" $< > $@
@@ -14,64 +16,33 @@ autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)
keysdir = $(datadir)/mime-info
keys_in_file = evolution.keys.in.in
-keys_file = $(keys_in_file:.keys.in.in=.keys)
+keys_DATA = $(keys_in_file:.keys.in.in=.keys)
%.keys.in: %.keys.in.in
sed -e "s|\@BASE_VERSION\@|$(BASE_VERSION)|" $< > $@
@INTLTOOL_KEYS_RULE@
mimedir = $(datadir)/mime-info
-mime_file = evolution.mime
+dist_mime_DATA = evolution.mime
if HAVE_KDE_APPLNK
kdedesktopdir = $(KDE_APPLNK_DIR)/Applications
-kdedesktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop)
-
-install-kde-applnk:
- $(mkinstalldirs) $(DESTDIR)$(kdedesktopdir); \
- $(INSTALL_DATA) $(kdedesktop_file) \
- $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
-
-uninstall-kde-applnk:
- rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
-
-else
-
-install-kde-applnk:
-uninstall-kde-applnk:
+kdedesktop_DATA = $(desktop_in_in_file:.desktop.in.in=.desktop)
endif
-noinst_MANS = evolution.1
-noinst_DATA = $(keys_file) $(desktop_file)
-
-SUBDIRS = icons
-
-install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
- $(mkinstalldirs) $(DESTDIR)$(desktopdir); \
- $(INSTALL_DATA) $(desktop_file) \
- $(DESTDIR)$(desktopdir)/$(desktop_file) ; \
- $(mkinstalldirs) $(DESTDIR)$(keysdir); \
- $(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ; \
- $(mkinstalldirs) $(DESTDIR)$(mimedir); \
- $(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
+dist_noinst_MANS = evolution.1
-uninstall-local: uninstall-kde-applnk
- rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file) ; \
- rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ; \
- rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
CLEANFILES = \
$(autostart_DATA) \
- $(desktop_file) \
- $(keys_file)
+ $(desktop_DATA) \
+ $(keys_DATA)
EXTRA_DIST = \
$(autostart_in_in_files) \
$(desktop_in_in_file) \
- $(mime_file) \
- $(keys_in_file) \
- $(noinst_MANS)
+ $(keys_in_file)
-include $(top_srcdir)/git.mk