* local directory is at mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
* comparing to mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
M  src/mon-gnome.c
M  Makefile.in
M  gnome/distccmon-gnome.desktop

* modified files

--- orig/Makefile.in
+++ mod/Makefile.in
@@ -45,11 +45,12 @@
 includedir = @includedir@
 oldincludedir = /usr/include
 docdir = @docdir@
-pkgdatadir = $(datadir)/@PACKAGE_NAME@
+icondir = $(datadir)/pixmaps
+desktopdir = $(datadir)/applications
 
 # These must be done from here, not from autoconf, because they can 
 # contain variable expansions written in Make syntax.  Ew.
-DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\""
+DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\""
 
 # arguments to pkgconfig
 GNOME_PACKAGES = @GNOME_PACKAGES@
@@ -508,7 +509,8 @@
 	@echo "  documents            $(DESTDIR)$(docdir)"
 	@echo "  programs             $(DESTDIR)$(bindir)"
 	@echo "  system configuration $(DESTDIR)$(sysconfdir)"
-	@echo "  shared data files    $(DESTDIR)$(pkgdatadir)"
+	@echo "  icons                $(DESTDIR)$(icondir)"
+	@echo "  .desktop file        $(DESTDIR)$(desktopdir)"
 
 
 # install-sh can't handle multiple arguments, but we don't need any
@@ -541,8 +543,8 @@
 	done
 
 install-gnome-data: $(gnome_data)
-	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
-	for p in $^; do				\
-	$(INSTALL_DATA) $$p $(DESTDIR)$(pkgdatadir) || exit 1;	\
-	done
+	$(mkinstalldirs) $(DESTDIR)$(icondir)
+	$(mkinstalldirs) $(DESTDIR)$(desktopdir)
+	$(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir)
+	$(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir)
 


--- orig/gnome/distccmon-gnome.desktop
+++ mod/gnome/distccmon-gnome.desktop
@@ -1,13 +1,11 @@
 [Desktop Entry]
-Version=0.9.4
-Encoding=UTF-8
 Exec=distccmon-gnome
 Name=distcc monitor
 GenericName=Distributed Compile Monitor
 Comment=Graphical view of distributed compile tasks
-Icon=distccmon-gnome-icon.png
+Icon=distccmon-gnome-icon
 TryExec=distccmon-gnome
 Terminal=false
 Type=Application
-Categories=GNOME;Application;Development;
+Categories=GNOME;Development;
 StartupNotify=true


--- orig/src/mon-gnome.c
+++ mod/src/mon-gnome.c
@@ -599,7 +599,7 @@
 
 #if GTK_CHECK_VERSION(2,2,0)
   gtk_window_set_icon_from_file (GTK_WINDOW (mainwin),
-                                 PKGDATADIR "/distccmon-gnome-icon.png",
+                                 ICONDIR "/distccmon-gnome-icon.png",
                                  NULL);
 #endif