fixup non-FHS paths in documentation before install

cannot do this during build to avoid inserting unsubstituted @sysconfdir@

2 files changed, 19 insertions, 18 deletions

diff --git a/debian/rules b/debian/rules
index dbccafd..22546ac 100755
--- a/debian/rules
+++ b/debian/rules
@@ -324,6 +324,12 @@ common-install-indep::
 	#--------------------------------------------------------------------
 	# install-indep
 	#
+	# Correct some paths in upstream documentation
+	sed -i \
+		-e "s?/usr/libexec?${libexecdir}?g" \
+		-e "s?/usr/ucb/vacation?${libexecdir}/vacation.sendmail?g" \
+		-e "s?/usr/adm/sm.bin?${sysconfdir}/mail/smrsh?g" \
+		${DEB_SRCDIR}/smrsh/README
 	# sendmail operations guide and other documentation
 	${INSTALL} -d ${PKG_DOC}/op
 	$(INSTALL_DATA) ${DEB_SRCDIR}/doc/op/op.ps	${PKG_DOC}/op/
@@ -336,11 +342,7 @@ common-install-indep::
 	$(INSTALL_DATA) ${DEB_SRCDIR}/sendmail/SECURITY		${PKG_DOC}/sendmail/
 	$(INSTALL_DATA) ${DEB_SRCDIR}/sendmail/TRACEFLAGS	${PKG_DOC}/sendmail/
 	$(INSTALL_DATA) ${DEB_SRCDIR}/sendmail/TUNING		${PKG_DOC}/sendmail/
-	sed -e "s?/usr/libexec?${libexecdir}?g" \
-		-e "s?/usr/ucb/vacation?${libexecdir}/vacation.sendmail?g" \
-		-e "s?/usr/adm/sm.bin?/etc/mail/smrsh?g" \
-		${DEB_SRCDIR}/smrsh/README \
-		> ${PKG_DOC}/smrsh.README;
+	$(INSTALL_DATA) ${DEB_SRCDIR}/smrsh/README	${PKG_DOC}/smrsh.README
 	$(INSTALL_DATA) debian/faq.txt			${PKG_DOC}/
 	${INSTALL} -d ${PKG_DOC}/libmilter/html
 	$(INSTALL_DATA) ${DEB_SRCDIR}/libmilter/README	${PKG_DOC}/libmilter/README
@@ -386,6 +388,13 @@ common-install-arch::
 	#--------------------------------------------------------------------
 	# install-arch
 	#
+	# Correct some paths in upstream man pages
+	sed -i \
+		-e "s?/usr/adm/sm.bin?${sysconfdir}/mail/smrsh?g" \
+		${DEB_SRCDIR}/smrsh/smrsh.8
+	sed -i \
+		-e "s?/etc/mail/statistics?${localstatedir}/lib/sendmail/sendmail.st?g" \
+		${DEB_SRCDIR}/sendmail/sendmail.8
 	# sendmail install proper... with a little help ;-}
 	#$(MAKE) install DESTDIR="$(CURDIR)/${PKG_DIR}";
 	# Finally, install the whole enchilada
@@ -427,25 +436,14 @@ common-install-arch::
 		${PKG_DIR}${mandir}/man1/mailq.sendmail.1;
 	mv ${PKG_DIR}${mandir}/man1/newaliases.1 \
 		${PKG_DIR}${mandir}/man8/newaliases.sendmail.8;
+	mv ${PKG_DIR}${mandir}/man8/sendmail.8 \
+		${PKG_DIR}${mandir}/man8/sendmail.sendmail.8
 	# Special handling of vacation - Debian has a seperate package
 	# with a different version (sigh) keep our copy just in case...
 	mv ${PKG_DIR}${libexecdir}/vacation \
 		${PKG_DIR}${libexecdir}/vacation.sendmail; \
 	mv ${PKG_DIR}${mandir}/man1/vacation.1 \
 		${PKG_DIR}${mandir}/man1/vacation.sendmail.1; \
-	# Correct some paths in upstream man pages
-	sed -e "s?/usr/adm/sm.bin?${sysconfdir}/mail/smrsh?g" \
-		-e "s?sm.bin?${sysconfdir}/mail/smrsh?g" \
-		${DEB_SRCDIR}/smrsh/smrsh.8 \
-		> ${DEB_SRCDIR}/smrsh/smrsh.8.new;
-	mv ${DEB_SRCDIR}/smrsh/smrsh.8.new ${DEB_SRCDIR}/smrsh/smrsh.8;
-	sed -e "s?/etc/mail/statistics?${localstatedir}/lib/sendmail/sendmail.st?g"\
-		${DEB_SRCDIR}/sendmail/sendmail.8 \
-		> ${DEB_SRCDIR}/sendmail/sendmail.8.new;
-	mv ${DEB_SRCDIR}/sendmail/sendmail.8.new \
-		${PKG_DIR}${mandir}/man8/sendmail.sendmail.8;
-	$(RM) ${DEB_SRCDIR}/sendmail/sendmail.8;
-	$(RM) ${PKG_DIR}${mandir}/man8/sendmail.8
 	# Debian stuff
 	(cd debian/sensible_mda && \
 		$(MAKE) -f Makefile install-arch \
diff --git a/debian/sendmail-bin.lintian-overrides b/debian/sendmail-bin.lintian-overrides
index 1487fc4..31154a0 100644
--- a/debian/sendmail-bin.lintian-overrides
+++ b/debian/sendmail-bin.lintian-overrides
@@ -13,3 +13,6 @@ package-contains-broken-symlink usr/share/man/man8/hoststat.8.gz sendmail-mta.8.
 package-contains-broken-symlink usr/share/man/man8/purgestat.8.gz sendmail-mta.8.gz
 binary-without-manpage usr/bin/mailq
 binary-without-manpage usr/sbin/newaliases
+
+# this refers to HP UX and Solaris
+FSSTND-dir-in-manual-page usr/share/man/man8/smrsh.8.gz:93 /var/adm/