brasero r1877 - in trunk: . data nautilus

[philippr svn gnome org]

Author: philippr
Date: Thu Feb  5 21:08:09 2009
New Revision: 1877
URL: http://svn.gnome.org/viewvc/brasero?rev=1877&view=rev

Log:
2009-02-05  Philippe Rouquier  <ykw localhost localdomain>

	Don't install desktop file for nautilus if we're not building the extension

	* configure.in:
	* data/Makefile.am:
	* data/brasero-nautilus.desktop.in.in:
	* nautilus/Makefile.am:

Added:
   trunk/nautilus/brasero-nautilus.desktop.in.in   (props changed)
      - copied unchanged from r1876, /trunk/data/brasero-nautilus.desktop.in.in
Removed:
   trunk/data/brasero-nautilus.desktop.in.in
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/data/Makefile.am
   trunk/nautilus/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Feb  5 21:08:09 2009
@@ -412,7 +412,6 @@
 docs/reference/version.xml
 data/Makefile
 data/brasero.desktop.in
-data/brasero-nautilus.desktop.in
 data/brasero-open-playlist.desktop.in
 data/brasero-open-image.desktop.in
 data/brasero-open-project.desktop.in
@@ -420,6 +419,7 @@
 data/icons/Makefile
 help/Makefile
 nautilus/Makefile
+nautilus/brasero-nautilus.desktop.in
 libbrasero-media/Makefile
 libbrasero-media/brasero-media.h
 src/plugins/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Thu Feb  5 21:08:09 2009
@@ -11,7 +11,6 @@
 
 desktopdir=$(datadir)/applications
 desktop_in_files =	brasero.desktop.in			\
-			brasero-nautilus.desktop.in		\
 			brasero-open-playlist.desktop.in	\
 			brasero-open-project.desktop.in		\
 			brasero-open-image.desktop.in		\

Modified: trunk/nautilus/Makefile.am
==============================================================================
--- trunk/nautilus/Makefile.am	(original)
+++ trunk/nautilus/Makefile.am	Thu Feb  5 21:08:09 2009
@@ -18,12 +18,16 @@
 	$(DISABLE_DEPRECATED)			\
 	$(BRASERO_HAL_CFLAGS)
 
+ INTLTOOL_DESKTOP_RULE@
 
-CLEANFILES = 			\
-	$(NULL)
+desktopdir=$(datadir)/applications
+desktop_in_files = brasero-nautilus.desktop.in
 
-DISTCLEANFILES = 		\
-	$(NULL)
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
+EXTRA_DIST = $(desktop_in_files)
+CLEANFILES = $(desktop_DATA)
+DISTCLEANFILES = $(NULL)
 
 ### Nautilus Extension
 nautilus_extensiondir = $(NAUTILUSDIR)