aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodney Dawes <dobey@ximian.com>2003-02-07 07:20:45 +0800
committerRodney Dawes <dobey@src.gnome.org>2003-02-07 07:20:45 +0800
commit11136022cc92e4dd36d2fb494e2e16d7aae13dd7 (patch)
tree4f38363dae05a69f13cfc71edf2abe809b59d45c
parent14d50af007f8ec7bee3ef6bb21305daf65d06164 (diff)
downloadgsoc2013-evolution-11136022cc92e4dd36d2fb494e2e16d7aae13dd7.tar
gsoc2013-evolution-11136022cc92e4dd36d2fb494e2e16d7aae13dd7.tar.gz
gsoc2013-evolution-11136022cc92e4dd36d2fb494e2e16d7aae13dd7.tar.bz2
gsoc2013-evolution-11136022cc92e4dd36d2fb494e2e16d7aae13dd7.tar.lz
gsoc2013-evolution-11136022cc92e4dd36d2fb494e2e16d7aae13dd7.tar.xz
gsoc2013-evolution-11136022cc92e4dd36d2fb494e2e16d7aae13dd7.tar.zst
gsoc2013-evolution-11136022cc92e4dd36d2fb494e2e16d7aae13dd7.zip
Fix KRB4_CFLAGS to work correctly Fix desktop file installation path Use
2003-02-06 Rodney Dawes <dobey@ximian.com> * configure.in: Fix KRB4_CFLAGS to work correctly * data/Makefile.am: Fix desktop file installation path * data/evolution.desktop.in: Use correct binary and categories, add StartupNotify=1 also, for startup-notification-enabled systems svn path=/trunk/; revision=19832
-rw-r--r--ChangeLog7
-rw-r--r--configure.in2
-rw-r--r--data/Makefile.am2
-rw-r--r--data/evolution.desktop.in6
4 files changed, 13 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index b836c29b13..9a63af8f7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-06 Rodney Dawes <dobey@ximian.com>
+
+ * configure.in: Fix KRB4_CFLAGS to work correctly
+ * data/Makefile.am: Fix desktop file installation path
+ * data/evolution.desktop.in: Use correct binary and categories, add
+ StartupNotify=1 also, for startup-notification-enabled systems
+
2003-02-06 Dan Winship <danw@ximian.com>
* configure.in: export priv*dir for libical's configure to use.
diff --git a/configure.in b/configure.in
index 4c54a9ded3..d124437e5c 100644
--- a/configure.in
+++ b/configure.in
@@ -656,7 +656,7 @@ if test "x${with_krb4}" != "xno"; then
KRB4_CFLAGS="-I$with_krb4/include"
fi
if test -d "$with_krb4/include/kerberosIV"; then
- KRB4_CFLAGS="-I$with_krb4/include/kerberosIV"
+ KRB4_CFLAGS="$KRB4_CFLAGS -I$with_krb4/include/kerberosIV"
fi
KRB4_LDFLAGS="-L$with_krb4/lib $ac_cv_lib_kerberos4"
diff --git a/data/Makefile.am b/data/Makefile.am
index 23f8c01da4..102b28ead7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-desktopdir = $(datadir)/gnome/apps/Applications
+desktopdir = $(datadir)/applications
desktop_in_file = evolution.desktop.in
desktop_file = $(desktop_in_file:.desktop.in=.desktop)
@INTLTOOL_DESKTOP_RULE@
diff --git a/data/evolution.desktop.in b/data/evolution.desktop.in
index bd25a8fe29..e6a849a588 100644
--- a/data/evolution.desktop.in
+++ b/data/evolution.desktop.in
@@ -1,8 +1,10 @@
[Desktop Entry]
_Name=Ximian Evolution
_Comment=The Evolution groupware suite
-Exec=evolution
+Exec=evolution-1.3
Icon=evolution.png
Terminal=0
Type=Application
-Categories=Application;Calendar;Office
+Categories=GNOME;Application;Office;
+StartupNotify=true
+