From 8f26bb9052fe1bb131d2062da4fcd917fc9ad4da Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sat, 27 Dec 2008 16:35:06 +1000 Subject: 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 Signed-off-by: Dan McGee --- etc/makepkg.conf.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'etc') 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 " ######################################################################### -# BUILDSCRIPT/EXTENSION DEFAULTS +# EXTENSION DEFAULTS ######################################################################### # # WARNING: Do NOT modify these variables unless you know what you are # doing. # -BUILDSCRIPT='PKGBUILD' PKGEXT='@PKGEXT@' SRCEXT='@SRCEXT@' -- cgit v1.2.3-70-g09d2