diff options
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | doc/.cvsignore | 1 | ||||
| -rw-r--r-- | doc/Makefile.am | 48 | ||||
| -rw-r--r-- | doc/PKGBUILD.5 | 3 | ||||
| -rw-r--r-- | doc/libalpm.3 | 3 | ||||
| -rw-r--r-- | doc/makepkg.8 | 3 | ||||
| -rw-r--r-- | doc/makepkg.conf.5 | 3 | ||||
| -rw-r--r-- | doc/pacman.8 | 3 | ||||
| -rw-r--r-- | doc/pacman.conf.5 | 3 |
9 files changed, 37 insertions, 53 deletions
diff --git a/configure.ac b/configure.ac index 436c5fbe..d0b9d35f 100644 --- a/configure.ac +++ b/configure.ac @@ -38,11 +38,6 @@ AC_CHECK_FUNCS([strverscmp]) AM_PROG_LIBTOOL AM_CONDITIONAL(LINKSTATIC, test "$enable_static" = "yes") -dnl Help line for man2html -AC_ARG_ENABLE(man2html, - AC_HELP_STRING([--enable-man2html], [Build html docs via man2html]), - [wantman2html=$enableval], [wantman2html=no]) - dnl Help line for doxygen AC_ARG_ENABLE(doxygen, AC_HELP_STRING([--disable-doxygen], [Build API docs via Doxygen]), @@ -118,23 +113,6 @@ dnl Humor lowers blood pressure AC_MSG_CHECKING(your blood pressure) AC_MSG_RESULT([a bit high, but we can proceed]) -dnl Check for man2html binary -AC_MSG_CHECKING(for man2html) -if test "x$wantman2html" = "xyes" ; then - AC_CHECK_PROGS([MAN2HTML], [man2html]) - if test $MAN2HTML ; then - AC_MSG_RESULT(yes) - useman2html=yes - else - AC_MSG_RESULT(no, man2html missing) - useman2html=no - fi -else - AC_MSG_RESULT(no, disabled by configure) - useman2html=no -fi -AM_CONDITIONAL(HAS_MAN2HTML, test "x$useman2html" = "xyes") - dnl Check for doxygen support AC_MSG_CHECKING(for doxygen) if test "x$wantdoxygen" = "xyes" ; then @@ -242,7 +220,6 @@ pacman-$VERSION: pacman.conf location : ${configfile} Doxygen support : ${usedoxygen} - man2html support : ${useman2html} debug support : ${debug} fakeroot-proof support : ${fakeroot} " diff --git a/doc/.cvsignore b/doc/.cvsignore index a55527b2..b6ab6ec3 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -1,3 +1,4 @@ Makefile Makefile.in +*.html man3 diff --git a/doc/Makefile.am b/doc/Makefile.am index df55026a..ead359c3 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,27 +1,3 @@ -all: makepkg.8 pacman.8 PKGBUILD.5 makepkg.conf.5 pacman.conf.5 - -if HAS_MAN2HTML -makepkg.8: - man2html makepkg.8 > html/makepkg.8.html - -pacman.8: - man2html pacman.8 > html/pacman.8.html - -PKGBUILD.5: - man2html PKGBUILD.5 > html/PKGBUILD.5.html - -makepkg.conf.5: - man2html makepkg.8 > html/makepkg.8.html - -pacman.conf.5: - man2html pacman.conf.5 > html/pacman.conf.5.html - -endif - -clean: - rm -f html/*.html - rm -f man3/*.3 - man_MANS = \ pacman.8 \ makepkg.8 \ @@ -35,3 +11,27 @@ man_MANS += $(wildcard man3/*.3) endif EXTRA_DIST = $(man_MANS) + +MAN2HTML=man2html -r +SUFFIXES=.3 .5 .8 .3.html .5.html .8.html + +# targets for each man section, sed removes a weird artifact left by man2html +.3.3.html: + $(RM) $@ + -${MAN2HTML} $< | sed '1,2d' > $@ + +.5.5.html: + $(RM) $@ + -${MAN2HTML} $< | sed '1,2d' > $@ + +.8.8.html: + $(RM) $@ + -${MAN2HTML} $< | sed '1,2d' > $@ + +man2html: pacman.8.html makepkg.8.html PKGBUILD.5.html makepkg.conf.5.html pacman.conf.5.html libalpm.3.html + +clean-local: + $(RM) *.html + $(RM) man3/*.3 + +.PHONY: man2html diff --git a/doc/PKGBUILD.5 b/doc/PKGBUILD.5 index 9f52edee..34bdc263 100644 --- a/doc/PKGBUILD.5 +++ b/doc/PKGBUILD.5 @@ -269,5 +269,6 @@ Judd Vinet <jvinet@zeroflux.org> Aurelien Foret <aurelien@archlinux.org> Aaron Griffin <aaron@archlinux.org> Dan McGee <dan@archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. diff --git a/doc/libalpm.3 b/doc/libalpm.3 index af1ef4fe..e78e9eca 100644 --- a/doc/libalpm.3 +++ b/doc/libalpm.3 @@ -48,5 +48,6 @@ Judd Vinet <jvinet@zeroflux.org> Aurelien Foret <aurelien@archlinux.org> Aaron Griffin <aaron@archlinux.org> Dan McGee <dan@archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. diff --git a/doc/makepkg.8 b/doc/makepkg.8 index eb89b99e..1a0a4eb5 100644 --- a/doc/makepkg.8 +++ b/doc/makepkg.8 @@ -141,5 +141,6 @@ Judd Vinet <jvinet@zeroflux.org> Aurelien Foret <aurelien@archlinux.org> Aaron Griffin <aaron@archlinux.org> Dan McGee <dan@archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. diff --git a/doc/makepkg.conf.5 b/doc/makepkg.conf.5 index 3c6a2980..7b764060 100644 --- a/doc/makepkg.conf.5 +++ b/doc/makepkg.conf.5 @@ -142,5 +142,6 @@ Judd Vinet <jvinet@zeroflux.org> Aurelien Foret <aurelien@archlinux.org> Aaron Griffin <aaron@archlinux.org> Dan McGee <dan@archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. diff --git a/doc/pacman.8 b/doc/pacman.8 index 0d42f366..1d1473ca 100644 --- a/doc/pacman.8 +++ b/doc/pacman.8 @@ -259,5 +259,6 @@ Judd Vinet <jvinet@zeroflux.org> Aurelien Foret <aurelien@archlinux.org> Aaron Griffin <aaron@archlinux.org> Dan McGee <dan@archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. diff --git a/doc/pacman.conf.5 b/doc/pacman.conf.5 index 181f8755..21585240 100644 --- a/doc/pacman.conf.5 +++ b/doc/pacman.conf.5 @@ -137,5 +137,6 @@ Judd Vinet <jvinet@zeroflux.org> Aurelien Foret <aurelien@archlinux.org> Aaron Griffin <aaron@archlinux.org> Dan McGee <dan@archlinux.org> -See the 'AUTHORS' file for additional contributors. .fi + +See the 'AUTHORS' file for additional contributors. |