[pacman-dev] CVS update of pacman-lib (9 files)

dan at archlinux.org dan at archlinux.org
Thu Feb 22 22:23:07 EST 2007 

    Date: Thursday, February 22, 2007 @ 22:23:07
  Author: dan
    Path: /home/cvs-pacman/pacman-lib

Modified: configure.ac (1.35 -> 1.36) doc/.cvsignore (1.2 -> 1.3)
          doc/Makefile.am (1.15 -> 1.16) doc/PKGBUILD.5 (1.7 -> 1.8)
          doc/libalpm.3 (1.4 -> 1.5) doc/makepkg.8 (1.6 -> 1.7)
          doc/makepkg.conf.5 (1.2 -> 1.3) doc/pacman.8 (1.6 -> 1.7)
          doc/pacman.conf.5 (1.2 -> 1.3)

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


--------------------+
 configure.ac       |   23 -----------------------
 doc/.cvsignore     |    1 +
 doc/Makefile.am    |   48 ++++++++++++++++++++++++------------------------
 doc/PKGBUILD.5     |    3 ++-
 doc/libalpm.3      |    3 ++-
 doc/makepkg.8      |    3 ++-
 doc/makepkg.conf.5 |    3 ++-
 doc/pacman.8       |    3 ++-
 doc/pacman.conf.5  |    3 ++-
 9 files changed, 37 insertions(+), 53 deletions(-)


Index: pacman-lib/configure.ac
diff -u pacman-lib/configure.ac:1.35 pacman-lib/configure.ac:1.36
--- pacman-lib/configure.ac:1.35	Thu Feb 22 21:00:30 2007
+++ pacman-lib/configure.ac	Thu Feb 22 22:23:06 2007
@@ -38,11 +38,6 @@
 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 @@
 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.conf location   : ${configfile}
 
     Doxygen support        : ${usedoxygen}
-    man2html support       : ${useman2html}
     debug support          : ${debug}
     fakeroot-proof support : ${fakeroot}
 "
Index: pacman-lib/doc/.cvsignore
diff -u pacman-lib/doc/.cvsignore:1.2 pacman-lib/doc/.cvsignore:1.3
--- pacman-lib/doc/.cvsignore:1.2	Fri Feb  9 16:54:57 2007
+++ pacman-lib/doc/.cvsignore	Thu Feb 22 22:23:06 2007
@@ -1,3 +1,4 @@
 Makefile
 Makefile.in
+*.html
 man3
Index: pacman-lib/doc/Makefile.am
diff -u pacman-lib/doc/Makefile.am:1.15 pacman-lib/doc/Makefile.am:1.16
--- pacman-lib/doc/Makefile.am:1.15	Thu Feb 22 16:34:51 2007
+++ pacman-lib/doc/Makefile.am	Thu Feb 22 22:23:07 2007
@@ -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 @@
 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
Index: pacman-lib/doc/PKGBUILD.5
diff -u pacman-lib/doc/PKGBUILD.5:1.7 pacman-lib/doc/PKGBUILD.5:1.8
--- pacman-lib/doc/PKGBUILD.5:1.7	Sun Feb 11 20:08:35 2007
+++ pacman-lib/doc/PKGBUILD.5	Thu Feb 22 22:23:07 2007
@@ -269,5 +269,6 @@
 Aurelien Foret <aurelien at archlinux.org>
 Aaron Griffin <aaron at archlinux.org>
 Dan McGee <dan at archlinux.org>
-See the 'AUTHORS' file for additional contributors.
 .fi
+
+See the 'AUTHORS' file for additional contributors.
Index: pacman-lib/doc/libalpm.3
diff -u pacman-lib/doc/libalpm.3:1.4 pacman-lib/doc/libalpm.3:1.5
--- pacman-lib/doc/libalpm.3:1.4	Thu Feb  8 22:44:54 2007
+++ pacman-lib/doc/libalpm.3	Thu Feb 22 22:23:07 2007
@@ -48,5 +48,6 @@
 Aurelien Foret <aurelien at archlinux.org>
 Aaron Griffin <aaron at archlinux.org>
 Dan McGee <dan at archlinux.org>
-See the 'AUTHORS' file for additional contributors.
 .fi
+
+See the 'AUTHORS' file for additional contributors.
Index: pacman-lib/doc/makepkg.8
diff -u pacman-lib/doc/makepkg.8:1.6 pacman-lib/doc/makepkg.8:1.7
--- pacman-lib/doc/makepkg.8:1.6	Wed Feb 14 10:06:03 2007
+++ pacman-lib/doc/makepkg.8	Thu Feb 22 22:23:07 2007
@@ -141,5 +141,6 @@
 Aurelien Foret <aurelien at archlinux.org>
 Aaron Griffin <aaron at archlinux.org>
 Dan McGee <dan at archlinux.org>
-See the 'AUTHORS' file for additional contributors.
 .fi
+
+See the 'AUTHORS' file for additional contributors.
Index: pacman-lib/doc/makepkg.conf.5
diff -u pacman-lib/doc/makepkg.conf.5:1.2 pacman-lib/doc/makepkg.conf.5:1.3
--- pacman-lib/doc/makepkg.conf.5:1.2	Fri Feb  9 10:37:20 2007
+++ pacman-lib/doc/makepkg.conf.5	Thu Feb 22 22:23:07 2007
@@ -142,5 +142,6 @@
 Aurelien Foret <aurelien at archlinux.org>
 Aaron Griffin <aaron at archlinux.org>
 Dan McGee <dan at archlinux.org>
-See the 'AUTHORS' file for additional contributors.
 .fi
+
+See the 'AUTHORS' file for additional contributors.
Index: pacman-lib/doc/pacman.8
diff -u pacman-lib/doc/pacman.8:1.6 pacman-lib/doc/pacman.8:1.7
--- pacman-lib/doc/pacman.8:1.6	Sat Feb 10 19:27:45 2007
+++ pacman-lib/doc/pacman.8	Thu Feb 22 22:23:07 2007
@@ -259,5 +259,6 @@
 Aurelien Foret <aurelien at archlinux.org>
 Aaron Griffin <aaron at archlinux.org>
 Dan McGee <dan at archlinux.org>
-See the 'AUTHORS' file for additional contributors.
 .fi
+
+See the 'AUTHORS' file for additional contributors.
Index: pacman-lib/doc/pacman.conf.5
diff -u pacman-lib/doc/pacman.conf.5:1.2 pacman-lib/doc/pacman.conf.5:1.3
--- pacman-lib/doc/pacman.conf.5:1.2	Thu Feb  8 22:44:54 2007
+++ pacman-lib/doc/pacman.conf.5	Thu Feb 22 22:23:07 2007
@@ -137,5 +137,6 @@
 Aurelien Foret <aurelien at archlinux.org>
 Aaron Griffin <aaron at archlinux.org>
 Dan McGee <dan at archlinux.org>
-See the 'AUTHORS' file for additional contributors.
 .fi
+
+See the 'AUTHORS' file for additional contributors.

More information about the pacman-dev mailing list