diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 23:40:11 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-12-22 23:40:11 +0000 |
| commit | b55bff9605590733a6623fada4c6ab95dffd48ba (patch) | |
| tree | 55967a10ee8ff20dcff4d90ae2d1e995a23b4bd2 /lib/MGA/DrakISO/BuildClassic.pm | |
| parent | 1fb7342916768c078edf6ce9bcac7bfd88bdfee0 (diff) | |
| download | drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.tar drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.tar.gz drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.tar.bz2 drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.tar.xz drakiso-b55bff9605590733a6623fada4c6ab95dffd48ba.zip | |
Simplify build directory structure.
Diffstat (limited to 'lib/MGA/DrakISO/BuildClassic.pm')
| -rwxr-xr-x | lib/MGA/DrakISO/BuildClassic.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/MGA/DrakISO/BuildClassic.pm b/lib/MGA/DrakISO/BuildClassic.pm index 86eaebd..b276a71 100755 --- a/lib/MGA/DrakISO/BuildClassic.pm +++ b/lib/MGA/DrakISO/BuildClassic.pm @@ -99,10 +99,10 @@ sub prepare_files { my $version = $build->{settings}{version}; my $tag = $build->{settings}{tag}; - my $files_dir = $build->get_builddir('files') . '/'; + my $arch_dir = $build->get_builddir('files') . '/' . $arch; - create_product_id($build, $files_dir . $arch . '/product.id'); - create_index($build, $files_dir . $arch . '/pkg-' . $version . '-' . $tag . '.idx'); + create_product_id($build, $arch_dir . '/product.id'); + create_index($build, $arch_dir . '/pkg-' . $version . '-' . $tag . '.idx'); } ############################################################################### @@ -474,7 +474,7 @@ sub build_installer_media { # Create a clean set of media directories my $arch = $build->{settings}{arch}; - my $arch_dir = $build->get_builddir($arch); + my $arch_dir = $build->get_builddir('files') . '/' . $arch; my $media_dir = $arch_dir . '/media/'; rm_rf($media_dir) if -e $media_dir; mkdir_p($media_dir . 'media_info'); |