1 diff -Naur distcc-3.1.orig/Makefile.in distcc-3.1/Makefile.in
2 --- distcc-3.1.orig/Makefile.in 2008-12-03 06:50:31.000000000 +0900
3 +++ distcc-3.1/Makefile.in 2009-02-02 00:40:20.000000000 +0900
4 @@ -49,13 +49,14 @@
5 includedir = @includedir@
6 oldincludedir = /usr/include
7 docdir = @docdir@
8 -pkgdatadir = $(datadir)/@PACKAGE_NAME@
9 +icondir = $(datadir)/pixmaps
10 +desktopdir = $(datadir)/applications
11
12 include_server_builddir = $(builddir)/_include_server
13
14 # These must be done from here, not from autoconf, because they can
15 # contain variable expansions written in Make syntax. Ew.
16 -DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\""
17 +DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\""
18
19 # arguments to pkgconfig
20 GNOME_PACKAGES = @GNOME_PACKAGES@
21 @@ -1003,7 +1004,8 @@
22 @echo " documents $(DESTDIR)$(docdir)"
23 @echo " programs $(DESTDIR)$(bindir)"
24 @echo " system configuration $(DESTDIR)$(sysconfdir)"
25 - @echo " shared data files $(DESTDIR)$(pkgdatadir)"
26 + @echo " icons $(DESTDIR)$(icondir)"
27 + @echo " .desktop file $(DESTDIR)$(desktopdir)"
28
29
30 # install-sh can't handle multiple arguments, but we don't need any
31 @@ -1086,10 +1088,10 @@
32 done
33
34 install-gnome-data: $(gnome_data)
35 - $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
36 - for p in $(gnome_data); do \
37 - $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \
38 - done
39 + $(mkinstalldirs) $(DESTDIR)$(icondir)
40 + $(mkinstalldirs) $(DESTDIR)$(desktopdir)
41 + $(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir)
42 + $(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir)
43
44 install-conf: $(conf_files) $(default_files)
45 $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc"
46 diff -Naur distcc-3.1.orig/gnome/distccmon-gnome.desktop distcc-3.1/gnome/distccmon-gnome.desktop
47 --- distcc-3.1.orig/gnome/distccmon-gnome.desktop 2008-12-03 06:50:27.000000000 +0900
48 +++ distcc-3.1/gnome/distccmon-gnome.desktop 2009-02-02 00:40:55.000000000 +0900
49 @@ -1,13 +1,11 @@
50 [Desktop Entry]
51 -Version=0.9.4
52 -Encoding=UTF-8
53 Exec=distccmon-gnome
54 Name=distcc monitor
55 GenericName=Distributed Compile Monitor
56 Comment=Graphical view of distributed compile tasks
57 -Icon=distccmon-gnome-icon.png
58 +Icon=distccmon-gnome-icon
59 TryExec=distccmon-gnome
60 Terminal=false
61 Type=Application
62 -Categories=GNOME;Application;Development;
63 +Categories=GNOME;Development;
64 StartupNotify=true
65 diff -Naur distcc-3.1.orig/src/mon-gnome.c distcc-3.1/src/mon-gnome.c
66 --- distcc-3.1.orig/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900
67 +++ distcc-3.1/src/mon-gnome.c 2009-02-02 00:41:18.000000000 +0900
68 @@ -599,7 +599,7 @@
69
70 #if GTK_CHECK_VERSION(2,2,0)
71 gtk_window_set_icon_from_file (GTK_WINDOW (mainwin),
72 - PKGDATADIR "/distccmon-gnome-icon.png",
73 + ICONDIR "/distccmon-gnome-icon.png",
74 NULL);
75 #endif
76
|
