driver: context: rename pn and pv variables to basename and version

pn and pv referred to package names and versions, but we don't really
have packages at the moment.

17 files changed, 96 insertions, 96 deletions

diff --git a/crates/driver/src/context.rs b/crates/driver/src/context.rs
index 4698171..999b085 100644
--- a/crates/driver/src/context.rs
+++ b/crates/driver/src/context.rs
@@ -75,7 +75,7 @@ impl<'ctx> Display for TaskRef<'ctx> {
 			return self.id.fmt(f);
 		}
 
-		let pv_arg = match self.args.get("pv") {
+		let version_arg = match self.args.get("version") {
 			Some(Arg::String(s)) => Some(s),
 			_ => None,
 		};
@@ -89,8 +89,8 @@ impl<'ctx> Display for TaskRef<'ctx> {
 		};
 
 		write!(f, "{}", self.id.recipe)?;
-		if let Some(pv) = pv_arg {
-			write!(f, "@{}", pv)?;
+		if let Some(version) = version_arg {
+			write!(f, "@{}", version)?;
 		}
 		write!(f, ":{}", self.id.task)?;
 
@@ -345,8 +345,8 @@ impl Context {
 
 		new_args.set("cross_compile", cross_compile);
 
-		new_args.set("pn", Some(task_def.meta.name.clone()));
-		new_args.set("pv", task_def.meta.version.clone());
+		new_args.set("basename", Some(task_def.meta.name.clone()));
+		new_args.set("version", task_def.meta.version.clone());
 
 		Ok(TaskRef {
 			id,
diff --git a/examples/recipes/binutils@2.41.yml b/examples/recipes/binutils@2.41.yml
index d6271a9..20c80fa 100644
--- a/examples/recipes/binutils@2.41.yml
+++ b/examples/recipes/binutils@2.41.yml
@@ -1,10 +1,10 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.xz'
+      - name: '{{basename}}-{{version}}.tar.xz'
         sha256: 'ae9a5789e23459e59606e6714723f2d3ffc31c03174191ef0d015bdf06007450'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz
 
   configure:
     args:
@@ -19,9 +19,9 @@ tasks:
       - recipe: 'toolchain'
         task: 'depends'
     run: |
-      mkdir {{pn}}-build
-      cd {{pn}}-build
-      ../{{pn}}-{{pv}}/configure \
+      mkdir {{basename}}-build
+      cd {{basename}}-build
+      ../{{basename}}-{{version}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --target={{target.gnu_triplet}} \
@@ -45,7 +45,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make
       find -name config.log -delete
 
@@ -61,5 +61,5 @@ tasks:
           - recipe: 'toolchain'
             task: 'depends'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}} install
diff --git a/examples/recipes/busybox@1.36.1.yml b/examples/recipes/busybox@1.36.1.yml
index abed443..98af9b8 100644
--- a/examples/recipes/busybox@1.36.1.yml
+++ b/examples/recipes/busybox@1.36.1.yml
@@ -1,21 +1,21 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.bz2'
+      - name: '{{basename}}-{{version}}.tar.bz2'
         sha256: 'b8cc24c9574d809e7279c3be349795c5d5ceb6fdf19ca709f80cde50e47de314'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.bz2
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.bz2
 
 
   configure:
     inherit:
       task: 'unpack'
     run: |
-      mkdir {{pn}}-build
-      cd {{pn}}-build
+      mkdir {{basename}}-build
+      cd {{basename}}-build
       make \
-        -f ../{{pn}}-{{pv}}/Makefile \
-        KBUILD_SRC=../{{pn}}-{{pv}} \
+        -f ../{{basename}}-{{version}}/Makefile \
+        KBUILD_SRC=../{{basename}}-{{version}} \
         defconfig
 
   compile:
@@ -30,16 +30,16 @@ tasks:
       - recipe: 'toolchain'
         task: 'depends'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make \
         ARCH={{host.karch}} \
         CROSS_COMPILE={{cross_compile}} \
         EXTRA_CFLAGS='-DBB_EXTRA_VERSION=""' \
-        {{pn}} busybox.links
+        {{basename}} busybox.links
       sed -i \
         -e 's@^/usr@@' \
         -e 's@^/sbin@/bin@' \
-        {{pn}}.links
+        {{basename}}.links
 
   install:
     args:
@@ -52,7 +52,7 @@ tasks:
           - recipe: 'toolchain'
             task: 'depends'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make \
         ARCH={{host.karch}} \
         CROSS_COMPILE={{cross_compile}} \
diff --git a/examples/recipes/e2fsprogs@1.47.0.yml b/examples/recipes/e2fsprogs@1.47.0.yml
index 9925772..873f46b 100644
--- a/examples/recipes/e2fsprogs@1.47.0.yml
+++ b/examples/recipes/e2fsprogs@1.47.0.yml
@@ -1,10 +1,10 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.xz'
+      - name: '{{basename}}-{{version}}.tar.xz'
         sha256: '144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz
 
   configure:
     args:
@@ -18,9 +18,9 @@ tasks:
       - recipe: 'toolchain'
         task: 'depends'
     run: |
-      mkdir {{pn}}-build
-      cd {{pn}}-build
-      ../{{pn}}-{{pv}}/configure \
+      mkdir {{basename}}-build
+      cd {{basename}}-build
+      ../{{basename}}-{{version}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --prefix={{host.prefix}}
@@ -32,7 +32,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make
       find -name config.log -delete
 
@@ -47,6 +47,6 @@ tasks:
           - recipe: 'toolchain'
             task: 'depends'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}} install
 
diff --git a/examples/recipes/gcc-libs@13.2.0.yml b/examples/recipes/gcc-libs@13.2.0.yml
index 5320d29..6c0c66d 100644
--- a/examples/recipes/gcc-libs@13.2.0.yml
+++ b/examples/recipes/gcc-libs@13.2.0.yml
@@ -11,7 +11,7 @@ tasks:
         host: 'build'
         target: 'host'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make all-target-libatomic all-target-libgomp all-target-libquadmath all-target-libstdc++-v3
 
   install:
@@ -23,7 +23,7 @@ tasks:
       default:
         path: 'sysroot'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}}/install install-target-libgcc install-target-libatomic install-target-libgomp install-target-libquadmath install-target-libstdc++-v3
       rm -r {{destdir}}/install{{build.prefix}}/lib/gcc
       mv -T {{destdir}}/install/{{build_to_host.sysroot}} {{destdir}}/sysroot
diff --git a/examples/recipes/gcc@13.2.0.yml b/examples/recipes/gcc@13.2.0.yml
index f59fd41..4d9b04e 100644
--- a/examples/recipes/gcc@13.2.0.yml
+++ b/examples/recipes/gcc@13.2.0.yml
@@ -1,12 +1,12 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.xz'
+      - name: '{{basename}}-{{version}}.tar.xz'
         sha256: 'e275e76442a6067341a27f04c5c6b83d8613144004c0413528863dc6b5c743da'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz
 
-      sed -i -e 's@^MULTILIB_OSDIRNAMES@# &@' {{pn}}-{{pv}}/gcc/config/*/t-*
+      sed -i -e 's@^MULTILIB_OSDIRNAMES@# &@' {{basename}}-{{version}}/gcc/config/*/t-*
 
   header-stubs:
     args:
@@ -45,9 +45,9 @@ tasks:
     run: |
       export CXX_FOR_TARGET="$CXX_FOR_TARGET -nostdinc++"
 
-      mkdir {{pn}}-build
-      cd {{pn}}-build
-      ../{{pn}}-{{pv}}/configure \
+      mkdir {{basename}}-build
+      cd {{basename}}-build
+      ../{{basename}}-{{version}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --target={{target.gnu_triplet}} \
@@ -58,7 +58,7 @@ tasks:
         --with-build-sysroot={{sysroot}} \
         --with-native-system-header-dir={{target.prefix}}/include \
         --with-toolexeclibdir={{host_to_target.sysroot}}{{target.prefix}}/lib \
-        --with-gxx-include-dir={{host_to_target.sysroot}}{{target.prefix}}/include/c++/"$(cat ../{{pn}}-{{pv}}/gcc/BASE-VER)" \
+        --with-gxx-include-dir={{host_to_target.sysroot}}{{target.prefix}}/include/c++/"$(cat ../{{basename}}-{{version}}/gcc/BASE-VER)" \
         --with-gnu-ld \
         --enable-shared \
         --enable-languages=c,c++ \
@@ -99,7 +99,7 @@ tasks:
       - task: 'header-stubs'
         noinherit: true
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make all-host
       find -name config.log -delete
 
@@ -119,6 +119,6 @@ tasks:
           - recipe: 'zlib'
             task: 'install'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}} install-host
 
diff --git a/examples/recipes/glibc@2.38-25-gf6445dc94da1.yml b/examples/recipes/glibc@2.38-25-gf6445dc94da1.yml
index 88eddbc..112e687 100644
--- a/examples/recipes/glibc@2.38-25-gf6445dc94da1.yml
+++ b/examples/recipes/glibc@2.38-25-gf6445dc94da1.yml
@@ -1,10 +1,10 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.xz'
+      - name: '{{basename}}-{{version}}.tar.xz'
         sha256: '92594ade540761f70d57de4f3a150128e7b7f7ed653a59d1acc23468ab70fae9'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz
 
   configure:
     args:
@@ -22,9 +22,9 @@ tasks:
     run: |
       export BUILD_CC="$CC_FOR_BUILD"
 
-      mkdir {{pn}}-build
-      cd {{pn}}-build
-      ../{{pn}}-{{pv}}/configure \
+      mkdir {{basename}}-build
+      cd {{basename}}-build
+      ../{{basename}}-{{version}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --prefix={{host.prefix}} \
@@ -48,7 +48,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make
 
   install:
@@ -62,5 +62,5 @@ tasks:
           - recipe: 'linux-uapi-headers'
             task: 'install'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make install_root={{destdir}} install
diff --git a/examples/recipes/gmp@6.3.0.yml b/examples/recipes/gmp@6.3.0.yml
index 8ff3385..ab8c895 100644
--- a/examples/recipes/gmp@6.3.0.yml
+++ b/examples/recipes/gmp@6.3.0.yml
@@ -1,10 +1,10 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.xz'
+      - name: '{{basename}}-{{version}}.tar.xz'
         sha256: 'a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz
 
   configure:
     args:
@@ -18,9 +18,9 @@ tasks:
       - recipe: 'toolchain'
         task: 'depends'
     run: |
-      mkdir {{pn}}-build
-      cd {{pn}}-build
-      ../{{pn}}-{{pv}}/configure \
+      mkdir {{basename}}-build
+      cd {{basename}}-build
+      ../{{basename}}-{{version}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --prefix={{host.prefix}}
@@ -32,7 +32,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make
 
   install:
@@ -46,7 +46,7 @@ tasks:
           - recipe: 'toolchain'
             task: 'depends'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}} install
       rm {{destdir}}{{host.prefix}}/lib/*.a
       rm {{destdir}}{{host.prefix}}/lib/*.la
diff --git a/examples/recipes/image.yml b/examples/recipes/image.yml
index 1ad324e..3f6d8f3 100644
--- a/examples/recipes/image.yml
+++ b/examples/recipes/image.yml
@@ -45,7 +45,7 @@ tasks:
     output:
       default: {}
     run: |
-      IMAGE={{destdir}}/{{pn}}.ext4
+      IMAGE={{destdir}}/{{basename}}.ext4
       UUID="$(
         python3 \
           -c 'import sys; import uuid; print(uuid.UUID(hex=sys.argv[1][:32], version=4))' \
diff --git a/examples/recipes/libgcc-initial@13.2.0.yml b/examples/recipes/libgcc-initial@13.2.0.yml
index 43f6f45..b48785d 100644
--- a/examples/recipes/libgcc-initial@13.2.0.yml
+++ b/examples/recipes/libgcc-initial@13.2.0.yml
@@ -12,7 +12,7 @@ tasks:
       - recipe: 'gcc'
         task: 'header-stubs'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make configure-target-libgcc
 
       # A hack borrowed from OpenEmbedded:
@@ -33,7 +33,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make all-target-libgcc
 
   install:
@@ -45,7 +45,7 @@ tasks:
     output:
       default: {}
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}} install-target-libgcc
 
-      ln -s libgcc.a {{destdir}}{{host.prefix}}/lib/gcc/{{target.gnu_triplet}}/"$(cat ../{{pn}}-{{pv}}/gcc/BASE-VER)"/libgcc_eh.a
+      ln -s libgcc.a {{destdir}}{{host.prefix}}/lib/gcc/{{target.gnu_triplet}}/"$(cat ../{{basename}}-{{version}}/gcc/BASE-VER)"/libgcc_eh.a
diff --git a/examples/recipes/libgcc@13.2.0.yml b/examples/recipes/libgcc@13.2.0.yml
index 96a2ce8..d7433fe 100644
--- a/examples/recipes/libgcc@13.2.0.yml
+++ b/examples/recipes/libgcc@13.2.0.yml
@@ -14,7 +14,7 @@ tasks:
         args:
           host: 'target'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make all-target-libgcc
 
   install:
@@ -26,7 +26,7 @@ tasks:
     output:
       default: {}
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}} install-target-libgcc
       rm {{destdir}}{{host_to_target.sysroot}}{{target.prefix}}/lib/libgcc_s.so*
       rmdir -p --ignore-fail-on-non-empty {{destdir}}{{host_to_target.sysroot}}{{target.prefix}}/lib
diff --git a/examples/recipes/linux-uapi-headers@6.5.5.yml b/examples/recipes/linux-uapi-headers@6.5.5.yml
index c431105..2cc6e05 100644
--- a/examples/recipes/linux-uapi-headers@6.5.5.yml
+++ b/examples/recipes/linux-uapi-headers@6.5.5.yml
@@ -3,10 +3,10 @@ meta:
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.xz'
+      - name: '{{basename}}-{{version}}.tar.xz'
         sha256: '8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz
 
   install:
     args:
@@ -16,6 +16,6 @@ tasks:
     output:
       default: {}
     run: |
-      cd {{pn}}-{{pv}}
+      cd {{basename}}-{{version}}
       make INSTALL_HDR_PATH={{destdir}}{{host.prefix}} ARCH={{host.karch}} headers_install
 
diff --git a/examples/recipes/linux@6.5.5.yml b/examples/recipes/linux@6.5.5.yml
index 77f5879..6448e0b 100644
--- a/examples/recipes/linux@6.5.5.yml
+++ b/examples/recipes/linux@6.5.5.yml
@@ -1,10 +1,10 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.xz'
+      - name: '{{basename}}-{{version}}.tar.xz'
         sha256: '8cf10379f7df8ea731e09bff3d0827414e4b643dd41dc99d0af339669646ef95'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz
 
   configure:
     args:
@@ -15,10 +15,10 @@ tasks:
       - recipe: 'gcc'
         task: 'install'
     run: |
-      mkdir {{pn}}-build
-      cd {{pn}}-build
+      mkdir {{basename}}-build
+      cd {{basename}}-build
       make \
-        -f ../{{pn}}-{{pv}}/Makefile \
+        -f ../{{basename}}-{{version}}/Makefile \
         ARCH={{host.karch}} \
         CROSS_COMPILE={{cross_compile}} \
         defconfig
@@ -31,7 +31,7 @@ tasks:
     run: |
       export KBUILD_BUILD_TIMESTAMP="@${SOURCE_DATE_EPOCH}"
 
-      cd {{pn}}-build
+      cd {{basename}}-build
       make \
         ARCH={{host.karch}} \
         CROSS_COMPILE={{cross_compile}} \
@@ -48,7 +48,7 @@ tasks:
       modules:
         path: 'modules'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       mkdir -p {{destdir}}/boot
       make \
         ARCH={{host.karch}} \
diff --git a/examples/recipes/make_ext4fs@2020-01-05.yml b/examples/recipes/make_ext4fs@2020-01-05.yml
index 53fed98..f77fde4 100644
--- a/examples/recipes/make_ext4fs@2020-01-05.yml
+++ b/examples/recipes/make_ext4fs@2020-01-05.yml
@@ -3,10 +3,10 @@ meta:
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.gz'
+      - name: '{{basename}}-{{version}}.tar.gz'
         sha256: 'bfe984cc757c676639090a5b34bdfc359cdef9b723de77efbce590872dce4132'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.gz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.gz
 
   compile:
     args:
@@ -22,7 +22,7 @@ tasks:
     inherit:
       task: 'unpack'
     run: |
-      cd {{pn}}-{{pv}}
+      cd {{basename}}-{{version}}
       make
 
   install:
@@ -38,7 +38,7 @@ tasks:
           - recipe: 'zlib'
             task: 'install'
     run: |
-      cd {{pn}}-{{pv}}
+      cd {{basename}}-{{version}}
       install -d {{destdir}}{{host.prefix}}/bin
       install -m755 make_ext4fs {{destdir}}{{host.prefix}}/bin/
 
diff --git a/examples/recipes/mpc@1.3.1.yml b/examples/recipes/mpc@1.3.1.yml
index 835b0af..01f7b1b 100644
--- a/examples/recipes/mpc@1.3.1.yml
+++ b/examples/recipes/mpc@1.3.1.yml
@@ -1,10 +1,10 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.gz'
+      - name: '{{basename}}-{{version}}.tar.gz'
         sha256: 'ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.gz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.gz
 
   configure:
     args:
@@ -20,9 +20,9 @@ tasks:
       - recipe: 'mpfr'
         task: 'install'
     run: |
-      mkdir {{pn}}-build
-      cd {{pn}}-build
-      ../{{pn}}-{{pv}}/configure \
+      mkdir {{basename}}-build
+      cd {{basename}}-build
+      ../{{basename}}-{{version}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --prefix={{host.prefix}}
@@ -34,7 +34,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make
 
   install:
@@ -50,7 +50,7 @@ tasks:
           - recipe: 'mpfr'
             task: 'install'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}} install
       rm {{destdir}}{{host.prefix}}/lib/*.a
       rm {{destdir}}{{host.prefix}}/lib/*.la
diff --git a/examples/recipes/mpfr@4.2.1.yml b/examples/recipes/mpfr@4.2.1.yml
index 5747932..c2ec024 100644
--- a/examples/recipes/mpfr@4.2.1.yml
+++ b/examples/recipes/mpfr@4.2.1.yml
@@ -1,10 +1,10 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.xz'
+      - name: '{{basename}}-{{version}}.tar.xz'
         sha256: '277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.xz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.xz
 
   configure:
     args:
@@ -20,9 +20,9 @@ tasks:
       - recipe: 'gmp'
         task: 'install'
     run: |
-      mkdir {{pn}}-build
-      cd {{pn}}-build
-      ../{{pn}}-{{pv}}/configure \
+      mkdir {{basename}}-build
+      cd {{basename}}-build
+      ../{{basename}}-{{version}}/configure \
         --build={{build.gnu_triplet}} \
         --host={{host.gnu_triplet}} \
         --prefix={{host.prefix}}
@@ -34,7 +34,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make
 
   install:
@@ -50,7 +50,7 @@ tasks:
           - recipe: 'gmp'
             task: 'install'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}} install
       rm {{destdir}}{{host.prefix}}/lib/*.a
       rm {{destdir}}{{host.prefix}}/lib/*.la
diff --git a/examples/recipes/zlib@1.3.yml b/examples/recipes/zlib@1.3.yml
index 0102e74..bd4e36c 100644
--- a/examples/recipes/zlib@1.3.yml
+++ b/examples/recipes/zlib@1.3.yml
@@ -1,10 +1,10 @@
 tasks:
   unpack:
     fetch:
-      - name: '{{pn}}-{{pv}}.tar.gz'
+      - name: '{{basename}}-{{version}}.tar.gz'
         sha256: 'ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e'
     run: |
-      tar xf {{dldir}}/{{pn}}-{{pv}}.tar.gz
+      tar xf {{dldir}}/{{basename}}-{{version}}.tar.gz
 
   configure:
     args:
@@ -18,9 +18,9 @@ tasks:
       - recipe: 'toolchain'
         task: 'depends'
     run: |
-      mkdir {{pn}}-build
-      cd {{pn}}-build
-      ../{{pn}}-{{pv}}/configure \
+      mkdir {{basename}}-build
+      cd {{basename}}-build
+      ../{{basename}}-{{version}}/configure \
         --prefix={{host.prefix}}
       find -name configure.log -delete
 
@@ -30,7 +30,7 @@ tasks:
     inherit:
       task: 'configure'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make
 
   install:
@@ -44,7 +44,7 @@ tasks:
           - recipe: 'toolchain'
             task: 'depends'
     run: |
-      cd {{pn}}-build
+      cd {{basename}}-build
       make DESTDIR={{destdir}} install
       rm {{destdir}}{{host.prefix}}/lib/*.a