gcompris r3644 - branches/gcomprixogoo

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sat Dec 13 11:56:50 2008
New Revision: 3644
URL: http://svn.gnome.org/viewvc/gcompris?rev=3644&view=rev

Log:
Merged with trunk 3642, removed deprecated desktop menu entry.



Removed:
   branches/gcomprixogoo/gcompris
Modified:
   branches/gcomprixogoo/ChangeLog
   branches/gcomprixogoo/Makefile.am

Modified: branches/gcomprixogoo/Makefile.am
==============================================================================
--- branches/gcomprixogoo/Makefile.am	(original)
+++ branches/gcomprixogoo/Makefile.am	Sat Dec 13 11:56:50 2008
@@ -24,17 +24,10 @@
 Applicationsdir = $(datadir)/
 Applications_in_files =
 Applications_DATA =
-
-Menudir=$(prefix)
-Menu_DATA=
-
 else
 Applicationsdir = $(datadir)/applications/
 Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
 Applications_DATA = gcompris.desktop gcompris-edit.desktop
-
-Menudir=$(prefix)/lib/menu
-Menu_DATA=gcompris
 endif
 
 @INTLTOOL_DESKTOP_RULE@
@@ -42,7 +35,6 @@
 EXTRA_DIST = \
 	$(Applications_in_files) \
 	$(icon_DATA) \
-	$(Menu_DATA) \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \