diff options
| -rwxr-xr-x | src/bin/paku.in | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/bin/paku.in b/src/bin/paku.in index adcba3e..8ed25a2 100755 --- a/src/bin/paku.in +++ b/src/bin/paku.in @@ -388,14 +388,14 @@ sub emit_debian() { for my $pkg (@{$json->{packages}}) { push @targets, <<~EOF; - \$(DIR)/tarballs/$pkg->{fname}: + \$(DIR)/debian/tarballs/$pkg->{fname}: mkdir -p \$(\@D) wget -O \$\@ \\ '$pkg->{url}' - \$(DIR)/checkouts/$pkg->{name}-$pkg->{version}: \$(DIR)/tarballs/$pkg->{fname} + \$(DIR)/debian/checkouts/$pkg->{name}-$pkg->{version}: \$(DIR)/debian/tarballs/$pkg->{fname} mkdir -p \$(\@D) - tar -C \$(\@D) -xf \$(DIR)/tarballs/$pkg->{fname} + tar -C \$(\@D) -xf \$(DIR)/debian/tarballs/$pkg->{fname} touch \$\@ EOF @@ -407,7 +407,7 @@ sub emit_debian() { my $deb_name = "$pkg->{name}_" . ( $pkg->{label} eq 'latest' ? 'latest' : $pkg->{version} ) . "_all.deb"; - my $deb_path = "\$(DIR)/debian/$deb_name"; + my $deb_path = "\$(DIR)/debian/public/$deb_name"; push @debs, "\t$deb_path \\\n"; @@ -415,16 +415,16 @@ sub emit_debian() { $ver =~ s/^v//; push @targets, <<~EOF; - \$(DIR)/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN: \$(DIR)/checkouts/$pkg->{name}-$pkg->{version} + \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN: \$(DIR)/debian/checkouts/$pkg->{name}-$pkg->{version} \$(MAKE) \\ - -C \$(DIR)/checkouts/$pkg->{name}-$pkg->{version} \\ + -C \$(DIR)/debian/checkouts/$pkg->{name}-$pkg->{version} \\ install \\ PREFIX=/usr \\ DESTDIR="\$\$PWD"/\$(\@D) mkdir -p \$\@ touch \$\@ - \$(DIR)/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN/control: \$(DIR)/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN + \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN/control: \$(DIR)/debian/builddirs/$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)/builddirs/$pkg->{name}-$pkg->{version}.deb: \$(DIR)/builddirs/$pkg->{name}-$pkg->{version}/DEBIAN/control - dpkg-deb --build \$(DIR)/builddirs/$pkg->{name}-$pkg->{version} + \$(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} - $deb_path: \$(DIR)/builddirs/$pkg->{name}-$pkg->{version}.deb + $deb_path: \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}.deb mkdir -p \$(\@D) - cp \$(DIR)/builddirs/$pkg->{name}-$pkg->{version}.deb \$\@ + cp \$(DIR)/debian/builddirs/$pkg->{name}-$pkg->{version}.deb \$\@ EOF @@ -473,26 +473,26 @@ sub emit_debian() { all: \\ - \$(DIR)/debian/InRelease \$(DIR)/debian/Release.gpg \\ - \$(DIR)/debian/public-key.asc debian.out.txt + \$(DIR)/debian/public/InRelease \$(DIR)/debian/public/Release.gpg \\ + \$(DIR)/debian/public/public-key.asc debian.out.txt debian.out.txt: - \@printf '\$(DIR)/debian/*\\n' > \$\@ + \@printf '\$(DIR)/debian/public/*\\n' > \$\@ - \$(DIR)/debian/Packages: \$(debs) + \$(DIR)/debian/public/Packages: \$(debs) cd \$(\@D) && paku debian-packages *.deb > \$(\@F) - \$(DIR)/debian/Release: \$(DIR)/debian/Packages - paku debian-release \$(DIR)/debian/Packages > \$\@ + \$(DIR)/debian/public/Release: \$(DIR)/debian/public/Packages + paku debian-release \$(DIR)/debian/public/Packages > \$\@ - \$(DIR)/debian/Release.gpg: \$(DIR)/debian/Release - gpg -abs -o \$\@ \$(DIR)/debian/Release + \$(DIR)/debian/public/Release.gpg: \$(DIR)/debian/public/Release + gpg -abs -o \$\@ \$(DIR)/debian/public/Release - \$(DIR)/debian/InRelease: \$(DIR)/debian/Release - gpg --default-key \$(GPGKEY) -a --clear-sign -o \$\@ \$(DIR)/debian/Release + \$(DIR)/debian/public/InRelease: \$(DIR)/debian/public/Release + gpg --default-key \$(GPGKEY) -a --clear-sign -o \$\@ \$(DIR)/debian/public/Release - \$(DIR)/debian/public-key.asc: \$(debs) + \$(DIR)/debian/public/public-key.asc: \$(debs) gpg --armour --export \$(GPGKEY) > \$\@ |