aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--configure.in3
-rw-r--r--data/.cvsignore1
-rw-r--r--data/Makefile.am16
-rw-r--r--data/epiphany.desktop.in9
5 files changed, 32 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e152b0de7..a63c8feb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2002-12-31 Marco Pesenti Gritti <marco@it.gnome.org>
+ * configure.in:
+ * data/.cvsignore:
+ * data/Makefile.am:
+
+ Build .in data files from the makefile,
+ not from configure.in.
+ Add a desktop file. We badly need an icon ;)
+
+2002-12-31 Marco Pesenti Gritti <marco@it.gnome.org>
+
* lib/toolbar/ephy-tbi-favicon.c:
(ephy_tbi_favicon_add_to_bonobo_tb_impl):
* lib/toolbar/ephy-tbi-spinner.c:
diff --git a/configure.in b/configure.in
index 5a52505c8..bc20dcb7a 100644
--- a/configure.in
+++ b/configure.in
@@ -157,9 +157,6 @@ data/Makefile
data/glade/Makefile
data/art/Makefile
data/ui/Makefile
-data/GNOME_Epiphany_NautilusView.server
-data/epiphany.schemas
-data/GNOME_Epiphany_Automation.server
lib/Makefile
lib/widgets/Makefile
lib/toolbar/Makefile
diff --git a/data/.cvsignore b/data/.cvsignore
index 1f6558686..5faa2c192 100644
--- a/data/.cvsignore
+++ b/data/.cvsignore
@@ -3,3 +3,4 @@ GNOME_Epiphany_NautilusView.server
Makefile
Makefile.in
epiphany.schemas
+epiphany.desktop
diff --git a/data/Makefile.am b/data/Makefile.am
index 60b11c546..e5d584df7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,6 +7,12 @@ server_in_files = GNOME_Epiphany_Automation.server.in GNOME_Epiphany_NautilusVie
server_DATA = GNOME_Epiphany_Automation.server GNOME_Epiphany_NautilusView.server
serverdir = $(libdir)/bonobo/servers
+DESKTOP_IN_FILES=epiphany.desktop.in
+DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
+
+Applicationsdir = $(datadir)/applications
+Applications_DATA = $(DESKTOP_FILES)
+
schemadir = $(sysconfdir)/gconf/schemas
schema_DATA = epiphany.schemas
@@ -22,8 +28,10 @@ install-data-local:
done \
fi
-CLEANFILES = GNOME_Epiphany_Automation.server
+CLEANFILES = $(server_DATA) $(Applications_DATA)
+
+EXTRA_DIST = $(server_in_files) \
+ $(schema_DATA) \
+ $(starthere_DATA) \
+ $(DESKTOP_IN_FILES)
-EXTRA_DIST = $(server_in_files) \
- $(schema_DATA) \
- $(starthere_DATA)
diff --git a/data/epiphany.desktop.in b/data/epiphany.desktop.in
new file mode 100644
index 000000000..cf28231d5
--- /dev/null
+++ b/data/epiphany.desktop.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Epiphany Web Browser
+_Comment=Browse the web
+Exec=epiphany
+Terminal=0
+Type=Application
+Icon=
+X-GNOME-DocPath=
+Categories=Application;Network;