Merge pull request Normation#591 from Kegeruneku/bug_6092/int/6092_pa…

…ckage_manpages_properly Fixes #6092: Package manpages properly
amousset · Jan 30, 2015 · fe7a916 · fe7a916
2 parents a5cf157 + c1e7bc6
commit fe7a916
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/rudder-agent/SOURCES/rudder-agent.sh b/rudder-agent/SOURCES/rudder-agent.sh
@@ -1 +1,13 @@
-export PATH=$PATH:/var/rudder/cfengine-community/bin
+# Add CFEngine binaries to the PATH
+PATH=${PATH}:/var/rudder/cfengine-community/bin
+export PATH
+
+# Add CFEngine manpages to the MANPATH
+if [ -z "${MANPATH}" ]
+then
+    MANPATH=/opt/rudder/share/man
+else
+    MANPATH=/opt/rudder/share/man:${MANPATH}
+fi
+
+export MANPATH
diff --git a/rudder-agent/SPECS/rudder-agent.spec b/rudder-agent/SPECS/rudder-agent.spec
@@ -251,9 +251,6 @@ make %{?_smp_mflags}
 rm -rf %{buildroot}
 %endif
 
-cd %{_sourcedir}/cfengine-source
-make install DESTDIR=%{buildroot} STRIP=""
-
 # Directories
 mkdir -p %{buildroot}%{rudderdir}
 mkdir -p %{buildroot}%{rudderdir}/share/man/man8
@@ -263,6 +260,17 @@ mkdir -p %{buildroot}%{ruddervardir}/cfengine-community/inputs
 mkdir -p %{buildroot}%{ruddervardir}/tmp
 mkdir -p %{buildroot}%{ruddervardir}/tools
 
+cd %{_sourcedir}/cfengine-source
+
+# CFEngine installation
+make install DESTDIR=%{buildroot} STRIP=""
+
+# CFEngine man pages
+for binary in cf-agent cf-promises cf-key cf-execd cf-serverd cf-monitord cf-runagent
+do
+  ${binary}/${binary} -M | gzip > %{buildroot}%{rudderdir}/share/man/man8/${binary}.8.gz
+done
+
 # Init script
 # AIX does not use init scripts, instead we set up a subsystem in the post scriptlet below
 %if "%{?_os}" != "aix"
@@ -439,11 +447,6 @@ slibclean
 NB_COPIED_BINARIES=`ls -1 /var/rudder/cfengine-community/bin/ | wc -l`
 if [ ${NB_COPIED_BINARIES} -gt 0 ];then echo "CFEngine binaries copied to workdir"; fi
 
-for i in cf-agent cf-promises cf-key cf-execd cf-serverd cf-monitord cf-runagent
-do
-  %{ruddervardir}/cfengine-community/bin/${i} -M | gzip > %{ruddervardir}/share/man/man8/${i}.8.gz
-done
-
 # Copy initial promises if there aren't any already
 if [ ! -e /var/rudder/cfengine-community/inputs/promises.cf ]
 then

diff --git a/rudder-agent/debian/postinst b/rudder-agent/debian/postinst
@@ -50,11 +50,6 @@ case "$1" in
     NB_COPIED_BINARIES=`ls -1 /var/rudder/cfengine-community/bin/ | wc -l`
     if [ ${NB_COPIED_BINARIES} -gt 0 ];then echo "CFEngine binaries copied to workdir"; fi
 
-    for i in cf-agent cf-promises cf-key cf-execd cf-serverd cf-monitord cf-runagent
-    do
-      /var/rudder/cfengine-community/bin/${i} -M | gzip > /opt/rudder/share/man/man8/${i}.8.gz
-    done
-
     # Copy initial promises if there aren't any already
     if [ ! -e /var/rudder/cfengine-community/inputs/promises.cf ]
     then

diff --git a/rudder-agent/debian/rules b/rudder-agent/debian/rules
@@ -53,6 +53,10 @@ install: build
 	# Add here commands to install the package into debian/tmp
 	cd SOURCES/cfengine-source && make install DESTDIR=$(CURDIR)/debian/tmp
 
+	# Add the CFEngine man pages in debian/tmp
+	cd SOURCES/cfengine-source && for binary in cf-agent cf-promises cf-key cf-execd cf-serverd cf-monitord cf-runagent; do \
+		$${binary}/$${binary} -M | gzip > $(CURDIR)/debian/tmp/opt/rudder/share/man/man8/$${binary}.8.gz ; \
+	done
 
 # Build architecture-independent files here.
 binary-indep: install