Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2020-05-11 12:59:51 +1000
committerAllan McRae <allan@archlinux.org>2020-06-01 10:59:08 +1000
commit454ea024383eab60295e4c4fdf2c329475887b2c (patch)
tree5f3397782b3bb7e061770a63da5b7e34877f8193 /doc
parent8ce142a2552418f64a74e773f659d92b065d6209 (diff)
Remove autotools support
This removes support for autotools in favour of meson.
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am162
-rw-r--r--doc/index.asciidoc8
2 files changed, 4 insertions, 166 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 4de67566..00000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,162 +0,0 @@
-# We have to do some funny stuff here with the manpages. In order to ensure
-# a dist tarball doesn't get put out there without manpages, we keep those
-# files listed in EXTRA_DIST no matter what. However, we only add them to
-# man_MANS if --enable-asciidoc and/or --enable-doxygen are used.
-
-MANPAGES = \
- alpm-hooks.5 \
- pacman.8 \
- makepkg.8 \
- makepkg-template.1 \
- repo-add.8 \
- vercmp.8 \
- pacman-key.8 \
- PKGBUILD.5 \
- makepkg.conf.5 \
- pacman.conf.5 \
- libalpm.3 \
- BUILDINFO.5 \
- pacman-conf.8
-
-DOXYGEN_MANS = $(wildcard man3/*.3)
-
-HTML_MANPAGES = $(addsuffix .html,$(MANPAGES))
-ASCIIDOC_MANPAGES = $(addsuffix .asciidoc,$(MANPAGES))
-
-HTML_OTHER = \
- index.html \
- submitting-patches.html \
- translation-help.html \
- HACKING.html
-
-HTML_DOCS = \
- $(HTML_MANPAGES) \
- $(HTML_OTHER)
-
-EXTRA_DIST = \
- meson.build \
- asciidoc.conf \
- asciidoc-override.css \
- PKGBUILD-example.txt \
- footer.asciidoc \
- index.asciidoc \
- submitting-patches.asciidoc \
- translation-help.asciidoc \
- $(ASCIIDOC_MANPAGES) \
- $(MANPAGES) \
- $(DOXYGEN_MANS)
-
-# Files that should be removed, but which Automake does not know.
-MOSTLYCLEANFILES = *.xml $(MANPAGES) $(HTML_DOCS) \
- pacman-hooks.5 repo-remove.8 website.tar.gz
-
-# Ensure manpages are fresh when building a dist tarball
-dist-hook:
- $(MAKE) $(AM_MAKEFLAGS) clean
- $(MAKE) $(AM_MAKEFLAGS) all
-
-if USE_GIT_VERSION
-GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//')
-REAL_PACKAGE_VERSION = $(GIT_VERSION)
-else
-REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
-endif
-
-man_MANS =
-dist_man_MANS = $(MANPAGES)
-
-if USE_DOXYGEN
-man_MANS += $(DOXYGEN_MANS)
-
-all-local: doxygen.in
-
-Doxyfile: Doxyfile.in
- sed 's,@OUTPUT_DIRECTORY@,./,' Doxyfile.in >Doxyfile
-
-doxygen.in: Doxyfile
- $(DOXYGEN) $(srcdir)/Doxyfile
-endif
-
-man: $(MANPAGES)
-html: $(HTML_DOCS)
-
-website: website.tar.gz
-
-.PHONY: html website
-
-website.tar.gz: html
- $(AM_V_GEN)bsdtar czf $@ $(HTML_DOCS) \
- asciidoc-override.css \
- -C /etc/asciidoc/stylesheets/ \
- asciidoc.css \
- -C /etc/asciidoc/javascripts/ \
- asciidoc.js \
- -C /etc/asciidoc/ \
- images
-
-pkgdatadir = ${datadir}/${PACKAGE}
-
-ASCIIDOC_OPTS = \
- -f $(srcdir)/asciidoc.conf \
- -a pacman_version="$(REAL_PACKAGE_VERSION)" \
- -a pacman_date="`date +%Y-%m-%d`" \
- -a srcext="$(SRCEXT)" \
- -a pkgext="$(PKGEXT)" \
- -a pkgdatadir=$(pkgdatadir) \
- -a localstatedir=$(localstatedir) \
- -a sysconfdir=$(sysconfdir) \
- -a datarootdir=$(datarootdir) \
- -a rootdir=$(ROOTDIR)
-
-A2X_OPTS = \
- --no-xmllint \
- -d manpage \
- -f manpage \
- --xsltproc-opts='-param man.endnotes.list.enabled 0 -param man.endnotes.are.numbered 0'
-
-# Generate manpages
-%: %.asciidoc asciidoc.conf footer.asciidoc Makefile.am
- $(AM_V_GEN)a2x $(A2X_OPTS) --asciidoc-opts="$(ASCIIDOC_OPTS) --out-file=./$@.xml" $(srcdir)/$@.asciidoc
-
-# Generate HTML pages
-%.html: %.asciidoc asciidoc.conf footer.asciidoc Makefile.am
- $(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - $*.asciidoc | \
- sed -e 's/\r$$//' > $@
-
-HACKING.html: ../HACKING
- $(AM_V_GEN)asciidoc $(ASCIIDOC_OPTS) -o - ../HACKING | \
- sed -e 's/\r$$//' > $@
-
-# Customizations for certain HTML docs
-%.html: ASCIIDOC_OPTS += -a linkcss -a toc -a icons -a max-width=960px -a stylesheet=asciidoc-override.css
-%.8.html: ASCIIDOC_OPTS += -d manpage
-%.5.html: ASCIIDOC_OPTS += -d manpage
-%.3.html: ASCIIDOC_OPTS += -d manpage
-
-# Custom dependency rules
-PKGBUILD.5 PKGBUILD.5.html: PKGBUILD.5.asciidoc PKGBUILD-example.txt
-
-# Manpages as symlinks
-repo-remove.8: repo-add.8
- $(RM) repo-remove.8
- $(LN_S) repo-add.8 repo-remove.8
-
-pacman-hooks.5: alpm-hooks.5
- $(RM) pacman-hooks.5
- $(LN_S) alpm-hooks.5 pacman-hooks.5
-
-install-data-hook:
- cd $(DESTDIR)$(mandir)/man8 && \
- $(RM) repo-remove.8 && \
- ( $(LN_S) repo-add.8 repo-remove.8 || \
- ln repo-add.8 repo-remove.8 || \
- cp repo-add.8 repo-remove.8 )
- cd $(DESTDIR)$(mandir)/man5 && \
- $(RM) pacman-hooks.5 && \
- ( $(LN_S) alpm-hooks.5 pacman-hooks.5 || \
- ln alpm-hooks.5 pacman-hooks.5 || \
- cp alpm-hooks.5 pacman-hooks.5 )
-
-uninstall-hook:
- $(RM) $(DESTDIR)$(mandir)/man8/repo-remove.8
- $(RM) $(DESTDIR)$(mandir)/man5/pacman-hooks.5
diff --git a/doc/index.asciidoc b/doc/index.asciidoc
index ebf02c20..716ceabf 100644
--- a/doc/index.asciidoc
+++ b/doc/index.asciidoc
@@ -193,11 +193,11 @@ link:https://sources.archlinux.org/other/pacman/[]. To install, download the new
available source tarball, unpack it in a directory, and run the three magic
commands:
- $ ./configure
- $ make
- # make install
+ $ meson build
+ $ ninja -C build
+ # ninja -C build install
-You may wish to read the options presented by `./configure --help` in order to
+You may wish to read the options presented by `meson` in order to
set appropriate paths and build options that are correct for your system.
Development