Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/makepkg.conf.5.asciidoc9
-rw-r--r--doc/meson.build2
-rw-r--r--etc/makepkg.conf.in3
4 files changed, 9 insertions, 7 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3c4a329f..5c575832 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -108,6 +108,8 @@ 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) \
diff --git a/doc/makepkg.conf.5.asciidoc b/doc/makepkg.conf.5.asciidoc
index 34810f51..9292b2a6 100644
--- a/doc/makepkg.conf.5.asciidoc
+++ b/doc/makepkg.conf.5.asciidoc
@@ -258,11 +258,12 @@ Options
Sets the command and options used when compressing compiled or source
packages in the named format.
-**PKGEXT=**".pkg.tar.gz", **SRCEXT=**".src.tar.gz"::
+**PKGEXT=**"{pkgext}", **SRCEXT=**"{srcext}"::
Sets the compression used when making compiled or source packages.
- Valid suffixes are `.tar`, `.tar.gz`, `.tar.bz2`, `.tar.xz`, `.tar.zst`,
- `.tar.lzo`, `.tar.lrz`, `.tar.lz4`, `.tar.lz` and `.tar.Z`.
- Do not touch these unless you know what you are doing.
+ Valid suffixes are `.tar.gz`, `.tar.bz2`, `.tar.xz`, `.tar.zst`,
+ `.tar.lzo`, `.tar.lrz`, `.tar.lz4`, `.tar.lz` and `.tar.Z`, or
+ simply `.tar` to disable compression entirely.
+
See Also
diff --git a/doc/meson.build b/doc/meson.build
index c081c1ee..a5bcd5b3 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -27,6 +27,8 @@ asciidoc_opts = [
'-f', asciidoc_conf,
'-a', 'pacman_version="@0@"'.format(PACKAGE_VERSION),
'-a', 'pacman_date=@0@'.format(run_command('date', '+%Y-%m-%d').stdout().strip()),
+ '-a', 'srcext=@0@'.format(get_option('src-ext')),
+ '-a', 'pkgext=@0@'.format(get_option('pkg-ext')),
'-a', 'pkgdatadir=@0@'.format(PKGDATADIR),
'-a', 'localstatedir=@0@'.format(LOCALSTATEDIR),
'-a', 'sysconfdir=@0@'.format(SYSCONFDIR),
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index f914684f..7e5da993 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -141,8 +141,5 @@ COMPRESSLZ=(lzip -c -f)
# EXTENSION DEFAULTS
#########################################################################
#
-# WARNING: Do NOT modify these variables unless you know what you are
-# doing.
-#
PKGEXT='@PKGEXT@'
SRCEXT='@SRCEXT@'