aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEttore Perazzoli <ettore@src.gnome.org>2000-06-12 08:41:06 +0800
committerEttore Perazzoli <ettore@src.gnome.org>2000-06-12 08:41:06 +0800
commit0889a3a50eb13d95f0a61efc73afa4f05125c8df (patch)
treee2b8509e26df5c36085721662425d70f08981284
parentc6b6c24c8cb1b1929bc260d4a97bb84ef0789e34 (diff)
downloadgsoc2013-evolution-0889a3a50eb13d95f0a61efc73afa4f05125c8df.tar.gz
gsoc2013-evolution-0889a3a50eb13d95f0a61efc73afa4f05125c8df.tar.zst
gsoc2013-evolution-0889a3a50eb13d95f0a61efc73afa4f05125c8df.zip
Fix a build problem (e-table now depends on the `misc' widgets, so we
need to build the `misc' directory first) and install a `.desktop' file and an icon file. (For now, the icon file is a copy of `evolution-inbox.png'.) svn path=/trunk/; revision=3527
-rw-r--r--ChangeLog13
-rw-r--r--Makefile.am6
-rw-r--r--evolution.desktop7
-rw-r--r--evolution.pngbin0 -> 4281 bytes
-rw-r--r--widgets/Makefile.am2
5 files changed, 27 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 374b2eb88b..6c672b7994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-06-12 Ettore Perazzoli <ettore@helixcode.com>
+
+ * widgets/Makefile.am (SUBDIRS): build `misc' before everything
+ else.
+
+ * Makefile.am: Install `evolution.png' and `evolution.desktop'
+ where appropriate.
+
+ * evolution.png: New. For now, it's just a copy of
+ `art/evolution-inbox.png'.
+
+ * evolution.desktop: New.
+
2000-06-10 Zbigniew Chyla <chyla@buy.pl>
* configure.in: Added pl (Polish) to ALL_LINGUAS
diff --git a/Makefile.am b/Makefile.am
index f6d04978ad..d3b340e965 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,5 +33,11 @@ SUBDIRS = \
po \
doc
+appicondir = $(datadir)/pixmaps
+appicon_DATA = evolution.png
+
+applicationdir = $(datadir)/gnome/apps/Applications
+application_DATA = evolution.desktop
+
dist-hook: evolution.spec
cp evolution.spec $(distdir)
diff --git a/evolution.desktop b/evolution.desktop
new file mode 100644
index 0000000000..c0c0855b41
--- /dev/null
+++ b/evolution.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Evolution
+Comment=The Evolution groupware suite
+Exec=evolution
+Icon=evolution.png
+Terminal=0
+Type=Application
diff --git a/evolution.png b/evolution.png
new file mode 100644
index 0000000000..3b0f90b292
--- /dev/null
+++ b/evolution.png
Binary files differ
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index a140d09102..a2c421ee7d 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,8 +1,8 @@
SUBDIRS = \
+ misc \
e-paned \
e-text \
e-table \
meeting-time-sel \
- misc \
shortcut-bar