GNOME.org
 

nemo r68 - in trunk: . gtk-gui

Author: arj
Date: Thu Jan 10 15:12:49 2008
New Revision: 68
URL: http://svn.gnome.org/viewvc/nemo?rev=68&view=rev

Log:
Fix prefix and DESTDIR



Modified:
   trunk/Makefile
   trunk/gtk-gui/MainWindow.cs
   trunk/nemo-autostart.desktop.in
   trunk/nemo-hidden.in
   trunk/nemo.desktop.in
   trunk/nemo.in

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	(original)
+++ trunk/Makefile	Thu Jan 10 15:12:49 2008
@@ -1,5 +1,7 @@
 PRG = nemo.exe
 
+PREFIX=/usr
+
 all:
 	make -C po/
 	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)
@@ -9,15 +11,15 @@
 
 install: $(PRG)
 	make -C po install
-	@sed -e "s|\ DESTDIR\@|$(DESTDIR)|g" < nemo.desktop.in > nemo.desktop
-	install -D nemo.desktop $(DESTDIR)/usr/share/applications/nemo.desktop
-	@sed -e "s|\ DESTDIR\@|$(DESTDIR)|g" < nemo-autostart.desktop.in > nemo-autostart.desktop
-	install -D nemo-autostart.desktop $(DESTDIR)/usr/share/gnome/autostart/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 -D $(PRG) $(DESTDIR)/usr/bin/$(PRG)
-	@sed -e "s|\ DESTDIR\@|$(DESTDIR)|g" < nemo.in > nemo
-	install -D nemo $(DESTDIR)/usr/bin/nemo
-	@sed -e "s|\ DESTDIR\@|$(DESTDIR)|g" < nemo-hidden.in > nemo-hidden
-	install -D nemo-hidden $(DESTDIR)/usr/bin/nemo-hidden
+	@sed -e "s|\ PREFIX\@|$(PREFIX)|g" < nemo.desktop.in > nemo.desktop
+	install -D nemo.desktop $(DESTDIR)$(PREFIX)/share/applications/nemo.desktop
+	@sed -e "s|\ PREFIX\@|$(PREFIX)|g" < nemo-autostart.desktop.in > nemo-autostart.desktop
+	install -D nemo-autostart.desktop $(DESTDIR)$(PREFIX)/share/gnome/autostart/nemo.desktop
+	install -D images/blue_guy.png $(DESTDIR)$(PREFIX)/share/nemo/nemo.png
+	install -D images/no-preview.png $(DESTDIR)$(PREFIX)/share/nemo/no-preview.png
+	install -D $(PRG) $(DESTDIR)$(PREFIX)/bin/$(PRG)
+	@sed -e "s|\ PREFIX\@|$(PREFIX)|g" < nemo.in > nemo
+	install -D nemo $(DESTDIR)$(PREFIX)/bin/nemo
+	@sed -e "s|\ PREFIX\@|$(PREFIX)|g" < nemo-hidden.in > nemo-hidden
+	install -D nemo-hidden $(DESTDIR)$(PREFIX)/bin/nemo-hidden
 	@rm nemo nemo-hidden nemo.desktop nemo-autostart.desktop

Modified: trunk/gtk-gui/MainWindow.cs
==============================================================================
--- trunk/gtk-gui/MainWindow.cs	(original)
+++ trunk/gtk-gui/MainWindow.cs	Thu Jan 10 15:12:49 2008
@@ -237,14 +237,14 @@
         this.prev_button.UseUnderline = true;
         // Container child prev_button.Gtk.Container+ContainerChild
         Gtk.Alignment w22 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-        // Container child GtkAlignment.Gtk.Container+ContainerChild
+        // Container child GtkAlignment1.Gtk.Container+ContainerChild
         Gtk.HBox w23 = new Gtk.HBox();
         w23.Spacing = 2;
-        // Container child GtkHBox.Gtk.Container+ContainerChild
+        // Container child GtkHBox1.Gtk.Container+ContainerChild
         Gtk.Image w24 = new Gtk.Image();
         w24.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-go-back", Gtk.IconSize.Menu, 16);
         w23.Add(w24);
-        // Container child GtkHBox.Gtk.Container+ContainerChild
+        // Container child GtkHBox1.Gtk.Container+ContainerChild
         Gtk.Label w26 = new Gtk.Label();
         w26.LabelProp = "";
         w23.Add(w26);
@@ -262,14 +262,14 @@
         this.next_button.UseUnderline = true;
         // Container child next_button.Gtk.Container+ContainerChild
         Gtk.Alignment w31 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-        // Container child GtkAlignment.Gtk.Container+ContainerChild
+        // Container child GtkAlignment2.Gtk.Container+ContainerChild
         Gtk.HBox w32 = new Gtk.HBox();
         w32.Spacing = 2;
-        // Container child GtkHBox.Gtk.Container+ContainerChild
+        // Container child GtkHBox2.Gtk.Container+ContainerChild
         Gtk.Image w33 = new Gtk.Image();
         w33.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-go-forward", Gtk.IconSize.Menu, 16);
         w32.Add(w33);
-        // Container child GtkHBox.Gtk.Container+ContainerChild
+        // Container child GtkHBox2.Gtk.Container+ContainerChild
         Gtk.Label w35 = new Gtk.Label();
         w35.LabelProp = "";
         w32.Add(w35);

Modified: trunk/nemo-autostart.desktop.in
==============================================================================
--- trunk/nemo-autostart.desktop.in	(original)
+++ trunk/nemo-autostart.desktop.in	Thu Jan 10 15:12:49 2008
@@ -3,7 +3,7 @@
 Name=Nemo
 Comment=A file manager for those who would rather have their files manage themselves
 Exec=nemo-hidden
-Icon= DESTDIR@/usr/share/nemo/nemo.png
+Icon= PREFIX@/share/nemo/nemo.png
 StartupNotify=true
 Terminal=false
 Type=Application

Modified: trunk/nemo-hidden.in
==============================================================================
--- trunk/nemo-hidden.in	(original)
+++ trunk/nemo-hidden.in	Thu Jan 10 15:12:49 2008
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec -a nemo /usr/bin/mono @DESTDIR@/usr/bin/nemo.exe --hidden
+exec -a nemo /usr/bin/mono @PREFIX@/bin/nemo.exe --hidden

Modified: trunk/nemo.desktop.in
==============================================================================
--- trunk/nemo.desktop.in	(original)
+++ trunk/nemo.desktop.in	Thu Jan 10 15:12:49 2008
@@ -3,7 +3,7 @@
 Name=Nemo
 Comment=A file manager for those who would rather have their files manage themselves
 Exec=nemo
-Icon= DESTDIR@/usr/share/nemo/nemo.png
+Icon= PREFIX@/share/nemo/nemo.png
 StartupNotify=true
 Terminal=false
 Type=Application

Modified: trunk/nemo.in
==============================================================================
--- trunk/nemo.in	(original)
+++ trunk/nemo.in	Thu Jan 10 15:12:49 2008
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-exec -a nemo /usr/bin/mono @DESTDIR@/usr/bin/nemo.exe
+exec -a nemo /usr/bin/mono @PREFIX@/bin/nemo.exe
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]