summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2010-05-13 18:11:50 -0500
committerDan McGee <dan@archlinux.org>2010-05-13 19:14:16 -0500
commitf03f09011f878ad0b3aea05602a1cb0a11d839e1 (patch)
tree4bf33b963e0ca01373e8b579e5a57ec93a23901f
parent10b0acfc20589abd92b5d7517529c92e48cfcc7c (diff)
doc: fix up description of where example PKGBUILD is located
As Allan pointed out, this actually ships with pacman (at least with Arch) and not necessarily with ABS or any other package. Also fix the language dealing with the prototype install files. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--doc/Makefile.am3
-rw-r--r--doc/PKGBUILD.5.txt15
2 files changed, 9 insertions, 9 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d2f6b35a..d5b7aada 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -86,10 +86,13 @@ endif
html: $(HTML_DOCS)
+pkgdatadir = ${datadir}/${PACKAGE}
+
ASCIIDOC_OPTS = \
-f asciidoc.conf \
-a pacman_version="$(REAL_PACKAGE_VERSION)" \
-a pacman_date="`date +%Y-%m-%d`" \
+ -a pkgdatadir=$(pkgdatadir) \
-a sysconfdir=$(sysconfdir)
A2X_OPTS = \
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 2d6589b2..2f49ca57 100644
--- a/doc/PKGBUILD.5.txt
+++ b/doc/PKGBUILD.5.txt
@@ -20,12 +20,10 @@ This manual page is meant to describe general rules about PKGBUILDs. Once a
PKGBUILD is written, the actual package is built using makepkg and installed
with pacman.
-NOTE: If you are using Arch Linux and have a local copy of the Arch Build
-System (ABS) tree on your computer, or are using another distribution that
-provides a similar tree of build files, you can copy the provided
-PKGBUILD.proto file to a new package build directory and make customizations to
-suit your needs. An up to date prototype file can also be found in the source
-distribution of this package.
+NOTE: An example PKGBUILD, useful for reference, is located in '{pkgdatadir}'.
+Also located there are other example files such as a ChangeLog and an install
+script. You can copy the provided PKGBUILD.proto file to a new package build
+directory and make customizations to suit your needs.
Options and Directives
@@ -324,9 +322,8 @@ same directory as the PKGBUILD script. Then use the install directive:
install=pkgname.install
The install script does not need to be specified in the source array. A
-template install file is available with the source distribution of this
-program, or one may be provided by your distribution. For example, Arch Linux
-provides prototype install files in the ABS tree.
+template install file is available in '{pkgdatadir}' as 'proto.install' for
+reference with all of the available functions defined.
Development Directives