[pacman-dev] [PATCH 1/2] makepkg: do not refer to src/ or pkg/
Use $srcdir and $pkgdir instead. Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/makepkg.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 89d40a7..92f31de 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1838,7 +1838,7 @@ write_pkginfo() { create_package() { if [[ ! -d $pkgdir ]]; then - error "$(gettext "Missing %s directory.")" "pkg/" + error "$(gettext "Missing %s directory.")" "\$pkgdir/" plain "$(gettext "Aborting...")" exit 1 # $E_MISSING_PKGDIR fi @@ -2975,14 +2975,14 @@ chmod a-s "$srcdir" cd_safe "$srcdir" if (( NOEXTRACT && ! VERIFYSOURCE )); then - warning "$(gettext "Using existing %s tree")" "src/" + warning "$(gettext "Using existing %s tree")" "\$srcdir/" elif (( !REPKG )); then download_sources check_source_integrity (( VERIFYSOURCE )) && exit 0 # $E_OK if (( CLEANBUILD )); then - msg "$(gettext "Removing existing %s directory...")" "src/" + msg "$(gettext "Removing existing %s directory...")" "\$srcdir/" rm -rf "$srcdir/*" fi @@ -2998,7 +2998,7 @@ if (( NOBUILD )); then else # clean existing pkg directory if [[ -d $pkgdirbase ]]; then - msg "$(gettext "Removing existing %s directory...")" "pkg/" + msg "$(gettext "Removing existing %s directory...")" "\$pkgdir/" rm -rf "$pkgdirbase" fi mkdir -p "$pkgdirbase" -- 1.8.4
Signed-off-by: Allan McRae <allan@archlinux.org> --- scripts/makepkg.sh.in | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 92f31de..654718a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -58,35 +58,35 @@ known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512') # Options ASDEPS=0 -NEEDED=0 ASROOT=0 +BUILDFUNC=0 +CHECKFUNC=0 +CLEANBUILD=0 CLEANUP=0 DEP_BIN=0 FORCE=0 -CLEANBUILD=0 -INFAKEROOT=0 GENINTEG=0 HOLDVER=0 -SKIPCHECKSUMS=0 -SKIPPGPCHECK=0 +IGNOREARCH=0 +INFAKEROOT=0 INSTALL=0 +LOGGING=0 +NEEDED=0 NOBUILD=0 NODEPS=0 NOEXTRACT=0 -VERIFYSOURCE=0 -RMDEPS=0 -REPKG=0 -LOGGING=0 -SOURCEONLY=0 -IGNOREARCH=0 -PREPAREFUNC=0 -BUILDFUNC=0 -CHECKFUNC=0 PKGFUNC=0 -PKGVERFUNC=0 -SPLITPKG=0 PKGLIST=() +PKGVERFUNC=0 +PREPAREFUNC=0 +REPKG=0 +RMDEPS=0 +SKIPCHECKSUMS=0 +SKIPPGPCHECK=0 SIGNPKG='' +SPLITPKG=0 +SOURCEONLY=0 +VERIFYSOURCE=0 # Forces the pkgver of the current PKGBUILD. Used by the fakeroot call # when dealing with svn/cvs/etc PKGBUILDs. -- 1.8.4
participants (1)
-
Allan McRae