[nautilus] Fix distcheck



commit ec4ce1431bda72fc66ace675d860e7c2bb3bc3e6
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue May 5 02:48:21 2009 +0200

    Fix distcheck
---
 Makefile.am         |    2 --
 data/Makefile.am    |    5 +++--
 src/nautilus-main.c |    5 ++++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f539d09..e5478f5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,6 @@ EXTRA_DIST=					\
 	HACKING					\
 	MAINTAINERS				\
 	README.commits				\
-	nautilus.desktop			\
-	nautilus.desktop.in			\
 	ChangeLog-20000414			\
 	ChangeLog-20000625			\
 	ChangeLog-20000831			\
diff --git a/data/Makefile.am b/data/Makefile.am
index 4d6a222..15cd0e4 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,8 +4,6 @@ xml_in_files = nautilus.xml.in
 xml_files = $(xml_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
- INTLTOOL_DESKTOP_RULE@
-
 desktopdir       = $(datadir)/applications
 desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
 desktop_in_files = 					\
@@ -16,6 +14,7 @@ desktop_in_files = 					\
 	nautilus-file-management-properties.desktop.in  \
 	nautilus-browser.desktop.in                     \
 	nautilus-autorun-software.desktop.in
+ INTLTOOL_DESKTOP_RULE@
 
 mimedir = $(datadir)/mime/packages
 mime_DATA = $(xml_files)
@@ -29,6 +28,8 @@ nautilusdata_DATA = \
 	$(NULL)
 
 EXTRA_DIST = $(nautilusdata_DATA) 	\
+	nautilus.desktop		\
+	nautilus.desktop.in		\
 	$(xml_in_files) 		\
 	$(desktop_in_files)		\
 	$(NULL)
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index f781dee..60273d7 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -391,7 +391,10 @@ main (int argc, char *argv[])
 	browser_window = FALSE;
 
 	g_set_prgname ("nautilus");
-	egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
+
+	if (g_file_test (DATADIR "/applications/nautilus.desktop", G_FILE_TEST_EXISTS)) {
+		egg_set_desktop_file (DATADIR "/applications/nautilus.desktop");
+	}
 
 	context = g_option_context_new (_("\n\nBrowse the file system with the file manager"));
 	g_option_context_add_main_entries (context, options, NULL);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]