aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--configure.in19
-rw-r--r--data/Makefile.am5
3 files changed, 33 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1432c780e4..ea954dd1f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-20 Ettore Perazzoli <ettore@ximian.com>
+
+ * data/Makefile.am [HAVE_KDE_APPLNK]: Install `evolution.desktop'
+ in the `KDE_APPLNK_DIR'.
+
+ * configure.in: New option `--with-kde-applnk-path'. Define the
+ `HAVE_KDE_APPLNK' Automake conditional, and the `KDE_APPLNK_DIR'
+ value.
+
2001-10-19 Dan Winship <danw@ximian.com>
* tools/Makefile.am (EXTRA_DIST): Merge the two EXTRA_DIST
diff --git a/configure.in b/configure.in
index d5f28df685..3d3ed505ba 100644
--- a/configure.in
+++ b/configure.in
@@ -1021,6 +1021,25 @@ dnl ******************
AC_ARG_WITH(sub-version, [ --with-sub-version=VERSION Specify a sub-version string])
AC_DEFINE_UNQUOTED(SUB_VERSION, "$with_sub_version")
+dnl ********************
+dnl KDE applnk directory
+dnl ********************
+AC_ARG_WITH(kde-applnk-path, [ --with-kde-applnk-path=PATH Location of KDE applnk files],
+ [with_kde_applnk_path="$withval"])
+AC_MSG_CHECKING(for the KDE applnk directory)
+if test -z "$with_kde_applnk_path"; then
+ with_kde_applnk_path="$prefix/share/applnk"
+fi
+if test -d "$with_kde_applnk_path" ; then
+ AC_MSG_RESULT("$with_kde_applnk_path" found)
+ KDE_APPLNK_DIR="$with_kde_applnk_path"
+else
+ AC_MSG_RESULT(not found)
+ KDE_APPLNK_DIR="no"
+fi
+AM_CONDITIONAL(HAVE_KDE_APPLNK, test "x$with_kde_applnk_path" != xno)
+AC_SUBST(KDE_APPLNK_DIR)
+
dnl ******************************
dnl Makefiles
dnl ******************************
diff --git a/data/Makefile.am b/data/Makefile.am
index a782cccc46..5c3fdfa410 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,4 +11,9 @@ keys_DATA = $(keys_in_files:.keys.in=.keys)
mimedir = $(datadir)/mime-info
mime_DATA = evolution.mime
+if HAVE_KDE_APPLNK
+kdedesktopdir = $(KDE_APPLNK_DIR)/Applications
+kdedesktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+endif
+
EXTRA_DIST = $(desktop_in_files) $(keys_in_files) $(mime_DATA)