--- Makefile	2009-12-18 14:10:35.000000000 -0600
+++ Makefile.orig	2010-01-04 06:23:20.000000000 -0600
@@ -26,13 +26,13 @@
 # install
 install:
 
-	-install -d $(DESTDIR)/etc/gnomenu $(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(PREFIX)/lib \
-	$(DESTDIR)$(PREFIX)/share $(DESTDIR)$(PREFIX)/lib/bonobo/servers $(DESTDIR)$(CAIRODOCKPREFIX)/share/cairo-dock/plug-ins/Dbus/third-party/GnoMenu
+	-install -d $(DESTDIR)/etc/gnomenu $(DESTDIR)$(PREFIX)/bin/ $(DESTDIR)$(PREFIX)/lib64 \
+	$(DESTDIR)$(PREFIX)/share $(DESTDIR)$(PREFIX)/lib64/bonobo/servers $(DESTDIR)$(CAIRODOCKPREFIX)/share/cairo-dock/plug-ins/Dbus/third-party/GnoMenu
 	@echo $(PREFIX) > $(DESTDIR)/etc/gnomenu/prefix
 	python -u setup.py
 	
 	#-install src/bin/GnoMenu.py $(DESTDIR)$(PREFIX)/bin/
-	-cp -r src/lib/gnomenu $(DESTDIR)$(PREFIX)/lib
+	-cp -r src/lib/gnomenu $(DESTDIR)$(PREFIX)/lib64
 	-cp -r src/share/gnomenu $(DESTDIR)$(PREFIX)/share
 	-cp -r src/share/avant-window-navigator $(DESTDIR)$(AWNPREFIX)/share
 	#-cp -r src/share/xfce4 $(DESTDIR)$(PREFIX)/share
@@ -40,20 +40,20 @@
 	-install src/share/cairo-dock/third-party/GnoMenu/* $(DESTDIR)$(CAIRODOCKPREFIX)/share/cairo-dock/plug-ins/Dbus/third-party/GnoMenu/
 	#-cp -r src/share/cairo-dock ~/.config/
 	-install src/bin/GnoMenu.py $(DESTDIR)$(PREFIX)/bin/
-	-install src/lib/bonobo/GNOME_GnoMenu.server $(DESTDIR)$(PREFIX)/lib/bonobo/servers
+	-install src/lib/bonobo/GNOME_GnoMenu.server $(DESTDIR)$(PREFIX)/lib64/bonobo/servers
 	@echo "Makefile: GnoMenu installed."
 
 
 # uninstall
 uninstall:
 
-	rm -rf $(PREFIX)/lib/gnomenu
+	rm -rf $(PREFIX)/lib64/gnomenu
 	rm -rf $(PREFIX)/share/gnomenu
 	rm -rf $(PREFIX)/share/avant-window-navigator/applets/GnoMenu.desktop
 	rm -rf $(PREFIX)/share/avant-window-navigator/applets/GnoMenu
 	#rm -rf $(PREFIX)/share/xfce4/panel-plugins/GnoMenu.desktop
 	rm -rf $(PREFIX)/bin/GnoMenu.py
-	rm -rf $(PREFIX)/lib/bonobo/servers/GNOME_GnoMenu.server
+	rm -rf $(PREFIX)/lib64/bonobo/servers/GNOME_GnoMenu.server
 	rm -rf /etc/gnomenu/prefix
 	rm -rf ~/.gnomenu
 	rm -rf ~/.config/cairo-dock/third-party/GnoMenu

--- src/bin/GnoMenu.py	2009-12-28 12:20:20.000000000 -0600
+++ src/bin/GnoMenu.py.orig	2010-03-15 15:54:31.000000000 -0500
@@ -29,7 +29,7 @@
 		os.system('python -u ' + INSTALL_PREFIX + '/lib/gnomenu/GnoMenu-Settings.py')
 	else:
 		after = sys.argv[1]
-		os.system('python -u ' + INSTALL_PREFIX + '/lib/gnomenu/GnoMenu.py ' + after)
+		os.system('python -u ' + INSTALL_PREFIX + '/lib64/gnomenu/GnoMenu.py ' + after)
 
 if len(sys.argv) != 2 or sys.argv[1] == '--help':
 	print "\nUsage: GnoMenu.py [Command] \n"

--- src/lib/gnomenu/GNOME_GnoMenu.server	2009-12-19 12:31:33.000000000 -0600
+++ src/lib/gnomenu/GNOME_GnoMenu.server.orig	2010-01-04 09:19:19.000000000 -0600
@@ -1,5 +1,5 @@
 <oaf_info>
-	<oaf_server iid="OAFIID:GNOME_GnoMenu_Factory" type="exe" location="/usr/lib/gnomenu/GnoMenu.py">
+	<oaf_server iid="OAFIID:GNOME_GnoMenu_Factory" type="exe" location="/usr/lib64/gnomenu/GnoMenu.py">
 		<oaf_attribute name="repo_ids" type="stringv">
 			<item value="IDL:Bonobo/GenericFactory:1.0"/>
 			<item value="IDL:Bonobo/Unknown:1.0"/>
@@ -17,7 +17,7 @@
 		<oaf_attribute name="name" type="string" value="GnoMenu"/>
 		<oaf_attribute name="description" type="string" value="Customizable Start Menu for the GNOME Desktop"/>
 		<oaf_attribute name="panel:category" type="string" value="Utilities"/>
-		<oaf_attribute name="panel:icon" type="string" value="/usr/lib/gnomenu/graphics/logo.png"/>
+		<oaf_attribute name="panel:icon" type="string" value="/usr/lib64/gnomenu/graphics/logo.png"/>
 		<oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/>
 	        <oaf_attribute name="bugzilla:product" type="string" value="gnome-panel"/>
 	        <oaf_attribute name="bugzilla:component" type="string" value="menu"/>

--- src/lib/gnomenu/GnoMenuDo.py	2009-12-01 09:46:09.000000000 -0600
+++ src/lib/gnomenu/GnoMenuDo.py.orig	2010-01-04 09:24:05.000000000 -0600
@@ -11,7 +11,7 @@
 	INSTALL_PREFIX = open("/etc/gnomenu/prefix").read()[:-1] 
 except:
 	INSTALL_PREFIX = '/usr'
-sys.path.append(INSTALL_PREFIX + '/lib/gnomenu')
+sys.path.append(INSTALL_PREFIX + '/lib64/gnomenu')
 
 import utils
 from awn.extras import awnlib, __version__
@@ -124,7 +124,7 @@
 		self.Globals.ReloadSettings()
 		
 	def about_info(self,event=0,data=None):
-		os.system("/bin/sh -c " + INSTALL_PREFIX +"'/lib/"+self.Globals.appdirname+"/GnoMenu-Settings.py --about' &")
+		os.system("/bin/sh -c " + INSTALL_PREFIX +"'/lib64/"+self.Globals.appdirname+"/GnoMenu-Settings.py --about' &")
 
 	def edit_menus(self,event=0, data=None):
 		os.spawnvp(os.P_WAIT,"alacarte",["alacarte"])
@@ -132,7 +132,7 @@
 
 applet_name = "GnoMenu"
 applet_description = "Consolidated menu for Gnome"
-applet_theme_logo = INSTALL_PREFIX + "/lib/gnomenu/graphics/" + "logo.png"
+applet_theme_logo = INSTALL_PREFIX + "/lib64/gnomenu/graphics/" + "logo.png"
 
 if __name__ == "__main__":
     awnlib.init_start(GnoMenu, {"name": applet_name,

--- src/lib/gnomenu/Globals.py	2010-03-14 18:22:28.000000000 -0500
+++ src/lib/gnomenu/Globals.py.orig	2010-03-15 18:58:24.000000000 -0500
@@ -68,9 +68,9 @@
 	os.system('mkdir ~/.'+appdirname)
 ConfigDirectory = HomeDirectory + '/.' +appdirname
 AutoStartDirectory = HomeDirectory + '/.config/autostart/'
-ProgramDirectory = INSTALL_PREFIX + "/lib/"+appdirname+"/" 
+ProgramDirectory = INSTALL_PREFIX + "/lib64/"+appdirname+"/" 
 ThemeDirectory = INSTALL_PREFIX + "/share/"+appdirname+"/Themes/"
-GraphicsDirectory = INSTALL_PREFIX + "/lib/"+appdirname+"/graphics/"  
+GraphicsDirectory = INSTALL_PREFIX + "/lib64/"+appdirname+"/graphics/"  
 
 
 #logging.debug('Globals - 5')
 
--- src/lib/gnomenu/GnoMenu.py	2010-03-07 08:55:54.000000000 -0600
+++ src/lib/gnomenu/GnoMenu.py.orig	2010-03-15 16:04:41.000000000 -0500
@@ -67,7 +67,7 @@
 except:
 	INSTALL_PREFIX = '/usr'
 
-#sys.path.append(INSTALL_PREFIX + '/lib/gnomenu/') #is this causing the oafiid error???
+#sys.path.append(INSTALL_PREFIX + '/lib64/gnomenu/') #is this causing the oafiid error???
 
 
 try:
@@ -200,7 +200,7 @@
 		######################################################################
 
 		if Globals.FirstUse:
-			os.system("/bin/sh -c " + INSTALL_PREFIX +"'/lib/"+Globals.appdirname+"/GnoMenu-Settings.py --welcome' &")
+			os.system("/bin/sh -c " + INSTALL_PREFIX +"'/lib64/"+Globals.appdirname+"/GnoMenu-Settings.py --welcome' &")
 
 
 		self.old_origin = None
@@ -416,7 +416,7 @@
 
 	def about_info(self,event,data=None):
 
-		os.system("/bin/sh -c " + INSTALL_PREFIX +"'/lib/"+Globals.appdirname+"/GnoMenu-Settings.py --about' &")
+		os.system("/bin/sh -c " + INSTALL_PREFIX +"'/lib64/"+Globals.appdirname+"/GnoMenu-Settings.py --about' &")
 
 	def properties(self,event,data=None):

--- src/lib/gnomenu/Start_Script.sh	2009-05-04 07:12:36.000000000 -0500
+++ src/lib/gnomenu/Start_Script.sh.orig	2010-01-04 18:39:17.000000000 -0600
@@ -1,2 +1,2 @@
 #!/bin/sh
-python -u /usr/lib/gnomenu/GnoMenu.py run-in-window
+python -u /usr/lib64/gnomenu/GnoMenu.py run-in-window

--- src/share/cairo-dock/third-party/GnoMenu/GnoMenu	2010-02-27 09:41:52.000000000 -0600
+++ src/share/cairo-dock/third-party/GnoMenu/GnoMenu.orig	2010-03-15 16:13:08.000000000 -0500
@@ -36,7 +36,7 @@
 	INSTALL_PREFIX = open("/etc/gnomenu/prefix").read()[:-1] 
 except:
 	INSTALL_PREFIX = '/usr'
-sys.path.append(INSTALL_PREFIX + '/lib/gnomenu')
+sys.path.append(INSTALL_PREFIX + '/lib64/gnomenu')
 import backend
 gettext.textdomain('gnomenu')
 gettext.install('gnomenu', INSTALL_PREFIX +  '/share/locale')
@@ -85,9 +85,9 @@
 
 def action_on_menu_select(iNumEntry):
 	if iNumEntry == 0:
-		os.system("/bin/sh -c '"+ INSTALL_PREFIX +"/lib/gnomenu/GnoMenu-Settings.py' &")  ## question : shouldn't it be in /usr/bin ?
+		os.system("/bin/sh -c '"+ INSTALL_PREFIX +"/lib64/gnomenu/GnoMenu-Settings.py' &")  ## question : shouldn't it be in /usr/bin ?
 	elif iNumEntry == 1:
-		os.system("/bin/sh -c '" + INSTALL_PREFIX +"/lib/gnomenu/GnoMenu-Settings.py --about' &")
+		os.system("/bin/sh -c '" + INSTALL_PREFIX +"/lib64/gnomenu/GnoMenu-Settings.py --about' &")
 	elif iNumEntry == 2:
 		os.spawnvp(os.P_WAIT,"alacarte",["alacarte"])

--- src/share/gnome-do/GnoMenu.desktop	2009-12-14 12:13:07.000000000 -0600
+++ src/share/gnome-do/GnoMenu.desktop.orig	2010-03-15 16:17:32.000000000 -0500
@@ -2,9 +2,9 @@
 
 [Desktop Entry]
 Name=GnoMenu
-Exec=python -u /usr/lib/gnomenu/GnoMenuDo.py
+GenericName=GnoMenu
+Exec=python -u /usr/lib64/gnomenu/GnoMenuDo.py
 Type=Application
 StartupNotify=true
 Comment=GnoMenu consolidated menu for Gnome
-Icon=/usr/lib/gnomenu/graphics/logo.png
-
+Icon=/usr/lib64/gnomenu/graphics/logo.png

--- src/share/avant-window-navigator/applets/GnoMenu/GnoMenu.py	2010-02-27 09:42:30.000000000 -0600
+++ src/share/avant-window-navigator/applets/GnoMenu/GnoMenu.py.orig	2010-03-15 16:25:48.000000000 -0500
@@ -13,7 +13,7 @@
 	INSTALL_PREFIX = open("/etc/gnomenu/prefix").read()[:-1] 
 except:
 	INSTALL_PREFIX = '/usr'
-sys.path.append(INSTALL_PREFIX + '/lib/gnomenu')
+sys.path.append(INSTALL_PREFIX + '/lib64/gnomenu')
 import gettext
 gettext.textdomain('gnomenu')
 gettext.install('gnomenu', INSTALL_PREFIX +  '/share/locale')
@@ -107,7 +107,7 @@
 		self.Globals.ReloadSettings()
 		
 	def about_info(self,event=0,data=None):
-		os.system("/bin/sh -c " + INSTALL_PREFIX +"'/lib/"+self.Globals.appdirname+"/GnoMenu-Settings.py --about' &")
+		os.system("/bin/sh -c " + INSTALL_PREFIX +"'/lib64/"+self.Globals.appdirname+"/GnoMenu-Settings.py --about' &")
 
 	def edit_menus(self,event=0, data=None):
 		os.spawnvp(os.P_WAIT,"alacarte",["alacarte"])
@@ -115,7 +115,7 @@
 
 applet_name = "GnoMenu"
 applet_description = "Consolidated menu for Gnome"
-applet_theme_logo = INSTALL_PREFIX + "/lib/gnomenu/graphics/" + "logo.svg"
+applet_theme_logo = INSTALL_PREFIX + "/lib64/gnomenu/graphics/" + "logo.svg"
 
 if __name__ == "__main__":
     awnlib.init_start(GnoMenu, {"name": applet_name,