From 00f783aef40bec4d6bb1e2f281915413c731d606 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Wed, 29 Mar 2023 10:03:28 -0300 Subject: src/bin/paku.in: Better name for Debian directories "builddirs" is only the installation target, so now it is "destdirs". "checkouts" are where the package is actually built, so now it is "builddirs". --- src/bin/paku.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/paku.in b/src/bin/paku.in index 8ed25a2..c823926 100755 --- a/src/bin/paku.in +++ b/src/bin/paku.in @@ -393,7 +393,7 @@ sub emit_debian() { wget -O \$\@ \\ '$pkg->{url}' - \$(DIR)/debian/checkouts/$pkg->{name}-$pkg->{version}: \$(DIR)/debian/tarballs/$pkg->{fname} + \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}: \$(DIR)/debian/tarballs/$pkg->{fname} mkdir -p \$(\@D) tar -C \$(\@D) -xf \$(DIR)/debian/tarballs/$pkg->{fname} touch \$\@ @@ -415,16 +415,16 @@ sub emit_debian() { $ver =~ s/^v//; push @targets, <<~EOF; - \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN: \$(DIR)/debian/checkouts/$pkg->{name}-$pkg->{version} + \$(DIR)/debian/destdirs/$pkg->{name}-$pkg->{version}/DEBIAN: \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version} \$(MAKE) \\ - -C \$(DIR)/debian/checkouts/$pkg->{name}-$pkg->{version} \\ + -C \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version} \\ install \\ PREFIX=/usr \\ DESTDIR="\$\$PWD"/\$(\@D) mkdir -p \$\@ touch \$\@ - \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN/control: \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN + \$(DIR)/debian/destdirs/$pkg->{name}-$pkg->{version}/DEBIAN/control: \$(DIR)/debian/destdirs/$pkg->{name}-$pkg->{version}/DEBIAN printf '' > \$\@ printf 'Package: $pkg->{name}\\n' >> \$\@ printf 'Version: $ver\\n' >> \$\@ @@ -448,12 +448,12 @@ sub emit_debian() { sed 's|^| |' >> \$\@ printf '\\n' >> \$\@ - \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}.deb: \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN/control - dpkg-deb --build \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version} + \$(DIR)/debian/destdirs/$pkg->{name}-$pkg->{version}.deb: \$(DIR)/debian/destdirs/$pkg->{name}-$pkg->{version}/DEBIAN/control + dpkg-deb --build \$(DIR)/debian/destdirs/$pkg->{name}-$pkg->{version} - $deb_path: \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}.deb + $deb_path: \$(DIR)/debian/destdirs/$pkg->{name}-$pkg->{version}.deb mkdir -p \$(\@D) - cp \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}.deb \$\@ + cp \$(DIR)/debian/destdirs/$pkg->{name}-$pkg->{version}.deb \$\@ EOF -- cgit v1.2.3