Date: Wednesday, May 17, 2023 @ 18:01:59
  Author: dvzrv
Revision: 477990

Remove use of srcdir and remove hardcoding of directory names.

Modified:
  zlib/trunk/PKGBUILD

----------+
 PKGBUILD |   21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2023-05-17 17:39:48 UTC (rev 477989)
+++ PKGBUILD    2023-05-17 18:01:59 UTC (rev 477990)
@@ -19,12 +19,11 @@
 validpgpkeys=('5ED46A6721D365587791E2AA783FCD8E58BCAFBA')
 
 prepare() {
-  cd "${srcdir}/zlib-$pkgver"
-  grep -A 24 '^  Copyright' zlib.h > LICENSE
+  grep -A 24 '^  Copyright' $pkgbase-$pkgver/zlib.h > LICENSE
 }
 
 build() {
-  cd "${srcdir}/zlib-$pkgver"
+  cd $pkgbase-$pkgver
 
   CFLAGS+=" -ffat-lto-objects"
   ./configure --prefix=/usr
@@ -39,19 +38,16 @@
 }
 
 check() {
-  cd "${srcdir}/zlib-$pkgver"
-  make test
+  make test -C $pkgbase-$pkgver
 
-  cd contrib/minizip
-  make -f Makefile.orig test
+  make -f Makefile.orig test -C $pkgbase-$pkgver/contrib/minizip
 }
 
 package_zlib() {
   pkgdesc='Compression library implementing the deflate compression method 
found in gzip and PKZIP'
 
-  cd "${srcdir}/zlib-$pkgver"
-  make install DESTDIR="${pkgdir}"
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/zlib/LICENSE"
+  make install DESTDIR="${pkgdir}" -C $pkgbase-$pkgver
+  install -D -m644 $pkgbase-$pkgver/LICENSE -t 
"${pkgdir}/usr/share/licenses/$pkgname/"
 }
 
 package_minizip() {
@@ -58,9 +54,8 @@
   pkgdesc='Mini zip and unzip based on zlib'
   depends=('zlib')
 
-  cd "${srcdir}/zlib-$pkgver/contrib/minizip"
-  make install DESTDIR="${pkgdir}"
-  install -D -m644 "${srcdir}/zlib-$pkgver/LICENSE" 
"${pkgdir}/usr/share/licenses/minizip/LICENSE"
+  make install DESTDIR="${pkgdir}" -C $pkgbase-$pkgver/contrib/$pkgname
+  install -D -m644 $pkgbase-$pkgver/LICENSE -t 
"${pkgdir}/usr/share/licenses/$pkgname/"
 
   # https://github.com/madler/zlib/pull/229
   rm "${pkgdir}/usr/include/minizip/crypt.h"

Reply via email to