diff -r a9cbdfa9697a -r 67831a9de168 cfengine/cfengine.spec
--- a/cfengine/cfengine.spec	Mon Sep 17 19:12:11 2012 +0200
+++ b/cfengine/cfengine.spec	Mon Sep 17 19:13:34 2012 +0200
@@ -74,10 +74,19 @@
     %{l_shtool} subst \
         -e 's;\(LIBS=.*\)-ltokyocabinet;\1`%{l_prefix}/bin/pkg-config --libs-only-l tokyocabinet`;' \
         -e 's;\(LIBS=.*\)-lcrypto;\1`%{l_prefix}/bin/pkg-config --libs-only-l openssl`;' \
+        -e "s;mandir=.\${datarootdir}/man.;;" \
+        -e "s;mandir=.\${exec_prefix}/share/man.;;" \
         configure
     %{l_shtool} subst \
         -e 's;\(masterfilesdir = \$(projdatadir)\)/CoreBase;\1/cfengine;' \
         masterfiles/Makefile.in
+    %{l_shtool} subst \
+        -e 's;\(string *=>\) "/var/cfengine/masterfiles";\1 translatepath("$(sys.workdir)/masterfiles");' \
+        -e 's;"/usr/local/sbin";"%{l_prefix}/bin";' \
+        masterfiles/failsafe.cf
+    %{l_shtool} subst \
+        -e 's;\(/var/cfengine/masterfiles\);%{l_prefix}\1;g' \
+        src/bootstrap.c
 
 %build
     #   configure package
@@ -103,14 +112,30 @@
 %install
     #   install package
     %{l_shtool} mkdir -f -p -m 755 \
-        $RPM_BUILD_ROOT%{l_prefix}/var/cfengine
-    %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+        $RPM_BUILD_ROOT%{l_prefix}/var/cfengine \
+        $RPM_BUILD_ROOT%{l_prefix}/share/cfengine/corebase
+    %{l_make} %{l_mflags} install DESTDIR="$RPM_BUILD_ROOT"
+
+    #   copy or move files to correct subdirectories
+    mv \
+        $RPM_BUILD_ROOT%{l_prefix}/share/doc/examples \
+        $RPM_BUILD_ROOT%{l_prefix}/share/cfengine
+    mv \
+        $RPM_BUILD_ROOT%{l_prefix}/share/cfengine/*.cf \
+        $RPM_BUILD_ROOT%{l_prefix}/share/cfengine/corebase/
+    cp \
+        $RPM_BUILD_ROOT%{l_prefix}/share/cfengine/corebase/* \
+        $RPM_BUILD_ROOT%{l_prefix}/var/cfengine/masterfiles/
+    cp -rp \
+        $RPM_BUILD_ROOT%{l_prefix}/bin \
+        $RPM_BUILD_ROOT%{l_prefix}/var/cfengine/
 
     #   strip down installation
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc >/dev/null 2>&1 || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/lib* >/dev/null 2>&1 || true
     rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir >/dev/null 2>&1 || true
-    strip $RPM_BUILD_ROOT%{l_prefix}/sbin/* >/dev/null 2>&1 || true
+    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
+    strip $RPM_BUILD_ROOT%{l_prefix}/var/cfengine/bin/* >/dev/null 2>&1 || true
 
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 \
@@ -127,6 +152,7 @@
     #   determine installation files
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
         %{l_files_std} \
+        '%config %{l_prefix}/var/cfengine/masterfiles/*' \
         '%config %{l_prefix}/etc/fsl/fsl.cfengine'
 
 %files -f files
@@ -138,4 +164,10 @@
     if [ ! -f $RPM_INSTALL_PREFIX/var/cfengine/ppkeys/localhost.priv ]; then
         $RPM_INSTALL_PREFIX/bin/cf-key
     fi
+    ( echo "You must choose a policy server (hub) to use and supply the"
+      echo "corresponding IP address while bootstrapping CFEngine for it"
+      echo "to be useful:"
+      echo ""
+      echo "    # $RPM_INSTALL_PREFIX/var/cfengine/bin/cf-agent --bootstrap --policy-server <ipddr>"
+    ) | %{l_rpmtool} msg -b -t notice