summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2008-12-27 07:35:06 +0100
committerDan McGee <dan@archlinux.org>2009-01-03 07:13:54 +0100
commit8f26bb9052fe1bb131d2062da4fcd917fc9ad4da (patch)
tree905de28caff6306085d909b3b2c1ed2477f318ce /etc
parent9a7f68317aa652cbc89e7fa69381d6239a63a6e7 (diff)
downloadpacman-8f26bb9052fe1bb131d2062da4fcd917fc9ad4da.tar.gz
pacman-8f26bb9052fe1bb131d2062da4fcd917fc9ad4da.tar.xz
makepkg: move BUILDSCRIPT from makepkg.conf
Commit 4b183bf9 moved makepkg.conf sourcing to after the parsing of options, breaking the -p option and --help output. The solution is to move BUILDSCRIPT out of makepkg.conf. This patch moves the definition BUILDSCRIPT back to makepkg itself and adds configure option to allow easy changing of this value during build time. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'etc')
-rw-r--r--etc/makepkg.conf.in3
1 files changed, 1 insertions, 2 deletions
diff --git a/etc/makepkg.conf.in b/etc/makepkg.conf.in
index 87b115c2..9872d5df 100644
--- a/etc/makepkg.conf.in
+++ b/etc/makepkg.conf.in
@@ -95,13 +95,12 @@ PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
#PACKAGER="John Doe <john@doe.com>"
#########################################################################
-# BUILDSCRIPT/EXTENSION DEFAULTS
+# EXTENSION DEFAULTS
#########################################################################
#
# WARNING: Do NOT modify these variables unless you know what you are
# doing.
#
-BUILDSCRIPT='PKGBUILD'
PKGEXT='@PKGEXT@'
SRCEXT='@SRCEXT@'