summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-05-04 15:54:42 -0500
committerDan McGee <dan@archlinux.org>2011-05-04 15:54:42 -0500
commit991bfb7cbfaf68749bfca181fcca9319a73f579e (patch)
tree5739bc34c089ed4835b4bdcf8fc5fe5f4e077fc9
parent7680f461575b63b592090dbf76c13aa7040b840b (diff)
parent8fd9037cfd8836db7dd35ba0e8825ba86c4e4688 (diff)
downloadpacman-991bfb7cbfaf68749bfca181fcca9319a73f579e.tar.xz
Merge branch 'maint'
-rw-r--r--doc/PKGBUILD-example.txt8
-rw-r--r--scripts/makepkg.sh.in2
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt
index 99fd8c24..238c0f40 100644
--- a/doc/PKGBUILD-example.txt
+++ b/doc/PKGBUILD-example.txt
@@ -13,8 +13,12 @@ source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz)
md5sums=('ee5ae84d115f051d87fcaaef3b4ae782')
build() {
- cd $srcdir/$pkgname-$pkgver
+ cd "$srcdir"/$pkgname-$pkgver
./configure --prefix=/usr
make
- make prefix=$pkgdir/usr install
+}
+
+package() {
+ cd "$srcdir"/$pkgname-$pkgver
+ make prefix="$pkgdir"/usr install
}
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 3d5184ad..b0d0c235 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1080,7 +1080,7 @@ create_package() {
*tar.bz2) bzip2 -c -f ;;
*tar.xz) xz -c -z - ;;
*tar) cat ;;
- esac > ${pkg_file} || ret=$?
+ esac > "${pkg_file}" || ret=$?
shopt -u nullglob
shopt -u -o pipefail