1
0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-10 11:35:00 -05:00

* Removed man2html stuff from configure. It is now available in the doc/

directory by running the target man2html, e.g. 'make man2html'.
* Slightly fixed up the bottom of the manpages.
This commit is contained in:
Dan McGee 2007-02-23 03:23:06 +00:00
parent a474586d15
commit 6fc803258a
9 changed files with 37 additions and 53 deletions

View File

@ -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}
"

View File

@ -1,3 +1,4 @@
Makefile
Makefile.in
*.html
man3

View File

@ -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

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.