diff options
| author | Andreas Beckmann <anbe@debian.org> | 2014-05-21 22:26:53 +0200 |
|---|---|---|
| committer | Andreas Beckmann <anbe@debian.org> | 2014-05-21 22:26:53 +0200 |
| commit | 9d2a2416ee8f948dd3b4cf227a36083bd56ef6ba (patch) | |
| tree | 1daff4387ac19c326f4cdc469d1a239b0251710d | |
| parent | 8c74864f4c9563a7afae5dca8cf5b707e986d0d0 (diff) | |
| download | sendmail-9d2a2416ee8f948dd3b4cf227a36083bd56ef6ba.tar.gz | |
create docdirs during install
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/configure.ac | 1 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | debian/sendmail-doc.dirs.in | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 6fd0882..2fd8992 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ sendmail (8.14.4-6) UNRELEASED; urgency=medium (backported from 8.14.8), thanks to David F. Skoll. (Closes: #747910) * Apply manpage corrections from Ubuntu. (Closes: #747551) * Remove outdated documentation and other cruft. + * Create directories during 'd/rules install' instead of using .dirs. -- Andreas Beckmann <anbe@debian.org> Tue, 22 Apr 2014 17:01:07 +0200 diff --git a/debian/configure.ac b/debian/configure.ac index a567c76..1a1c081 100644 --- a/debian/configure.ac +++ b/debian/configure.ac @@ -1694,7 +1694,6 @@ AC_CONFIG_FILES([sendmail-base.postinst]) AC_CONFIG_FILES([sendmail-base.postrm]) AC_CONFIG_FILES([sendmail-base.preinst]) AC_CONFIG_FILES([sendmail-base.prerm]) -AC_CONFIG_FILES([sendmail-doc.dirs]) AC_CONFIG_FILES([sendmail-doc.preinst]) AC_CONFIG_FILES([sendmail-cf.postrm]) AC_CONFIG_FILES([sendmail-cf.preinst]) diff --git a/debian/rules b/debian/rules index 3618745..f78fe4d 100755 --- a/debian/rules +++ b/debian/rules @@ -325,11 +325,13 @@ common-install-indep:: # install-indep # # sendmail operations guide and other documentation + ${INSTALL} -d ${PKG_DOC}/op $(INSTALL_DATA) ${DEB_SRCDIR}/doc/op/op.ps ${PKG_DOC}/op; $(INSTALL_DATA) ${DEB_SRCDIR}/doc/op/op.txt ${PKG_DOC}/op; $(INSTALL_DATA) ${DEB_SRCDIR}/README ${PKG_DOC}/; $(INSTALL_DATA) ${DEB_SRCDIR}/KNOWNBUGS ${PKG_DOC}/; $(INSTALL_DATA) ${DEB_SRCDIR}/cf/README ${PKG_DOC}/cf.README; + ${INSTALL} -d ${PKG_DOC}/sendmail $(INSTALL_DATA) ${DEB_SRCDIR}/sendmail/README \ ${PKG_DOC}/sendmail/; $(INSTALL_DATA) ${DEB_SRCDIR}/sendmail/SECURITY \ @@ -345,6 +347,7 @@ common-install-indep:: > ${PKG_DOC}/smrsh.README; $(INSTALL_DATA) debian/faq.txt ${PKG_DOC}/; # libmilter-dev package + ${INSTALL} -d ${PKG_DOC}/libmilter/html if [ -d ${DEB_SRCDIR}/libmilter ]; then \ $(INSTALL_DATA) ${DEB_SRCDIR}/libmilter/README \ ${PKG_DOC}/libmilter/README; \ diff --git a/debian/sendmail-doc.dirs.in b/debian/sendmail-doc.dirs.in deleted file mode 100644 index 100082d..0000000 --- a/debian/sendmail-doc.dirs.in +++ /dev/null @@ -1,3 +0,0 @@ -.@docdir@/sendmail-doc/libmilter/html -.@docdir@/sendmail-doc/op -.@docdir@/sendmail-doc/sendmail |