moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2025-02-28 09:21:53 -05:00
Code Issues Releases Wiki Activity

Ensure that manpages are always distributed and installed

Browse Source 
Commit 012f7939784358b02726c169543aa99436439335 was a bit misguided in its
thinking, and resulted in a package built without asciidoc enabled not
installing the manpages to the system on a 'make install' operation. Fix
this behavior by making manpages required in a normal build, and in order to
disable their existence, the '--disable-doc' option must be used.

Hopefully this solves manpage issues for both developers and package
builders while allowing as much flexibility as possible.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-12-21 23:47:18 -06:00
parent fdab7207e2
commit 26c05b1c8c
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -1,4 +1,7 @@
SUBDIRS = lib/libalpm src/util src/pacman scripts doc etc po pactest contrib SUBDIRS = lib/libalpm src/util src/pacman scripts etc po pactest contrib
if WANT_DOC
SUBDIRS += doc
endif
# Some files automatically included, so they aren't specified below: # Some files automatically included, so they aren't specified below:
# AUTHORS, COPYING, NEWS, README # AUTHORS, COPYING, NEWS, README

17
configure.ac
View File

@ -98,6 +98,11 @@ AC_ARG_WITH(db-ext,
AC_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]), AC_HELP_STRING([--with-db-ext=ext], [set the file extension used by the database]),
[DBEXT=$withval], [DBEXT=.db.tar.gz]) [DBEXT=$withval], [DBEXT=.db.tar.gz])
# Help line for documentation
AC_ARG_ENABLE(doc,
AC_HELP_STRING([--disable-doc], [prevent make from looking at doc/ dir]),
[wantdoc=$enableval], [wantdoc=yes])
# Help line for doxygen # Help line for doxygen
AC_ARG_ENABLE(doxygen, AC_ARG_ENABLE(doxygen,
AC_HELP_STRING([--enable-doxygen], [build your own API docs via Doxygen]), AC_HELP_STRING([--enable-doxygen], [build your own API docs via Doxygen]),
@ -218,6 +223,17 @@ AC_SUBST(CARCH)
AC_SUBST(CARCHFLAGS) AC_SUBST(CARCHFLAGS)
AC_SUBST(CHOST) AC_SUBST(CHOST)
# Check for documentation support and status
AC_MSG_CHECKING([for building documentation])
if test "x$wantdoc" = "xyes" ; then
AC_MSG_RESULT([yes])
wantdoc=yes
else
AC_MSG_RESULT([no, disabled by configure])
wantdoc=no
fi
AM_CONDITIONAL(WANT_DOC, test "x$wantdoc" = "xyes")
# Check for doxygen support and status # Check for doxygen support and status
AC_MSG_CHECKING([for doxygen]) AC_MSG_CHECKING([for doxygen])
if test "x$wantdoxygen" = "xyes" ; then if test "x$wantdoxygen" = "xyes" ; then
@ -336,6 +352,7 @@ pacman_display_version:
database extension : ${DBEXT} database extension : ${DBEXT}
Compilation options: Compilation options:
Run make in doc/ dir : ${wantdoc}
Doxygen support : ${usedoxygen} Doxygen support : ${usedoxygen}
Asciidoc support : ${useasciidoc} Asciidoc support : ${useasciidoc}
debug support : ${debug} debug support : ${debug}

17
doc/Makefile.am
View File

@ -14,15 +14,6 @@ ASCIIDOC_MANS = \
DOXYGEN_MANS = $(wildcard man3/*.3) DOXYGEN_MANS = $(wildcard man3/*.3)
man_MANS =
if USE_ASCIIDOC
man_MANS += $(ASCIIDOC_MANS)
endif
if USE_DOXYGEN
man_MANS += $(DOXYGEN_MANS)
endif
EXTRA_DIST = \ EXTRA_DIST = \
pacman.8.txt \ pacman.8.txt \
makepkg.8.txt \ makepkg.8.txt \
@ -38,9 +29,15 @@ EXTRA_DIST = \
$(DOXYGEN_MANS) $(DOXYGEN_MANS)
# Files that should be removed, but which Automake does not know. # Files that should be removed, but which Automake does not know.
MOSTLYCLEANFILES = $(DOXYGEN_MANS) *.xml MOSTLYCLEANFILES = *.xml
MAINTAINERCLEANFILES = $(ASCIIDOC_MANS)
man_MANS =
dist_man_MANS = $(ASCIIDOC_MANS)
if USE_DOXYGEN if USE_DOXYGEN
man_MANS += $(DOXYGEN_MANS)
all: doxygen.in all: doxygen.in
doxygen.in: doxygen.in: