distcc: fix host file and CONFFILES

diff --git a/packages/distcc/distcc_2.18.3.bb b/packages/distcc/distcc_2.18.3.bb
index 506618d..ebf02e1 100644 (file)
--- a/packages/distcc/distcc_2.18.3.bb
+++ b/packages/distcc/distcc_2.18.3.bb
@@ -2,14 +2,15 @@ DESCRIPTION = "distcc is a parallel build system that distributes \
 compilation of C/C++/ObjC code across machines on a network."
 SECTION = "devel"
 LICENSE = "GPLv2"
-PR = "r2"
+PR = "r3"
 
 DEPENDS = "avahi gtk+"
 RRECOMMENDS = "avahi-daemon"
 
 SRC_URI = "http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2 \
           file://distcc-avahi.patch;patch=1 \
-          file://default \
+          file://no-man.patch;patch=1 \
+           file://default \
           file://distcc"
 
 inherit autotools pkgconfig update-rc.d
@@ -21,8 +22,10 @@ EXTRA_OECONF = " --with-gtk "
 do_install_append() {
     install -d ${D}${sysconfdir}/init.d/
     install -d ${D}${sysconfdir}/default
+    install -d ${D}${sysconfdir}/distcc
     install -m 0755 ${WORKDIR}/distcc ${D}${sysconfdir}/init.d/
     install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/distcc
+    echo "+zeroconf" > ${D}${sysconfdir}/distcc/hosts
 }
 
 PACKAGES += "distcc-distmon-gnome"
@@ -31,5 +34,11 @@ FILES_${PN} = " ${sysconfdir} \
                ${bindir}/distcc \
                ${bindir}/distccd \
                ${bindir}/distccmon-text"
+
+CONFFILES_${PN} += "${sysconfdir}/default/distcc \
+                    ${sysconfdir}/distcc/hosts \
+                    ${sysconfdir}/init.d/distcc \
+                   " 
+
 FILES_distcc-distmon-gnome = "  ${bindir}/distccmon-gnome \
                                ${datadir}/distcc"

diff --git a/packages/distcc/files/no-man.patch b/packages/distcc/files/no-man.patch
new file mode 100644 (file)
index 0000000..ac1c18a
--- /dev/null
+++ b/packages/distcc/files/no-man.patch
@@ -0,0 +1,11 @@
+--- /tmp/Makefile.in   2008-01-06 16:44:45.696595605 +0100
++++ distcc-2.18.3/Makefile.in  2008-01-06 16:44:56.879181132 +0100
+@@ -556,7 +556,7 @@
+ # install-sh can't handle multiple arguments, but we don't need any
+ # tricky features so mkinstalldirs and cp will do
+ 
+-install: showpaths install-doc install-man install-programs install-example @INSTALL_GNOME@
++install: showpaths install-doc install-programs install-example @INSTALL_GNOME@
+ 
+ install-programs: $(bin_PROGRAMS)
+       $(mkinstalldirs) $(DESTDIR)$(bindir)