nemo r58 - trunk

[arj svn gnome org]

Author: arj
Date: Wed Jan  9 10:38:15 2008
New Revision: 58
URL: http://svn.gnome.org/viewvc/nemo?rev=58&view=rev

Log:
Make DESTDIR work



Added:
   trunk/nemo.in
Removed:
   trunk/nemo
Modified:
   trunk/Makefile
   trunk/NEWS

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Wed Jan  9 10:38:15 2008
@@ -5,12 +5,14 @@
 	gmcs -debug -unsafe dbus/*.cs broker/*.cs metadata/MetadataStore.cs common/*.cs gtk/*.cs uicommon/*.cs gtk-gui/*.cs -resource:images/no-preview.png,no-preview.png -resource:images/close.png,close.png -resource:images/zip.png,zip.png -resource:images/stock_about.png,stock_about.png -resource:images/image-x-generic.png,image-x-generic.png -resource:images/pdf.png,pdf.png -resource:images/text-html.png,text-html.png -resource:images/text-x-generic.png,text-x-generic.png -resource:images/dot.png,dot.png -resource:images/video-x-generic.png,video-x-generic.png -resource:images/x-office-document.png,x-office-document.png -resource:images/x-office-presentation.png,x-office-presentation.png -resource:images/x-office-spreadsheet.png,x-office-spreadsheet.png -resource:images/starred_right.png,starred_right.png -resource:images/big_star.png,big_star.png -resource:images/blue_guy.png,blue_guy.png -resource:images/blue_guy_med.png,blue_guy_med.png -resource:images/small_blue_guy.png,sma
 ll_blue_guy.png -r:System.Data -r:Mono.Data.Sqlite -r:Mono.Posix -r:Mono.Cairo -pkg:gtk-sharp-2.0 -pkg:gnome-sharp-2.0 -pkg:stetic -out:$(PRG)
 
 clean:
-	@if test -f $(PRG); then rm $(PRG); fi
+	@if test -f $(PRG); then rm $(PRG) nemo; fi
 
 install: $(PRG)
 	make -C po install
 	install -D nemo.desktop $(DESTDIR)/usr/share/applications/nemo.desktop
 	install -D images/blue_guy.png $(DESTDIR)/usr/share/nemo/nemo.png
 	install -D images/no-preview.png $(DESTDIR)/usr/share/nemo/no-preview.png
-	install $(PRG) $(DESTDIR)/usr/bin/$(PRG)
-	install nemo $(DESTDIR)/usr/bin/nemo
+	install -D $(PRG) $(DESTDIR)/usr/bin/$(PRG)
+	@sed -e "s|\ DESTDIR\@|$(DESTDIR)|g" < nemo.in > nemo
+	install -D nemo $(DESTDIR)/usr/bin/nemo
+	@rm nemo

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Jan  9 10:38:15 2008
@@ -26,6 +26,7 @@
 - Add shortcut for search
 - Show path in file view
 - If no labels are defined, don't make right click -> labels look bad
+- Make DESTDIR work, patch from Piotr Gaczkowski <doomhammerng gmail com>
 
 0.1.2 alpha
 -----------

Added: trunk/nemo.in
==============================================================================
--- (empty file)
+++ trunk/nemo.in	Wed Jan  9 10:38:15 2008
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec -a nemo /usr/bin/mono @DESTDIR@/usr/bin/nemo.exe