aboutsummaryrefslogtreecommitdiff
path: root/skel
diff options
context:
space:
mode:
authorpmichaud <pmichaud@pobox.com>2010-07-31 17:41:31 -0500
committerpmichaud <pmichaud@pobox.com>2010-07-31 17:41:31 -0500
commit4dcba4ff99473bba665ac6c7eb9c51b00040751a (patch)
treeec4e8bb854fc65340dca470463ac7b9517801894 /skel
parenteca3820c05f693b16d8cbc94330c72e7e864cbfa (diff)
Some more DESTDIR= fixes.
Diffstat (limited to 'skel')
-rw-r--r--skel/build/Makefile.in2
-rw-r--r--skel/build/module-install.pl1
2 files changed, 2 insertions, 1 deletions
diff --git a/skel/build/Makefile.in b/skel/build/Makefile.in
index f2ee1cb..e642f5f 100644
--- a/skel/build/Makefile.in
+++ b/skel/build/Makefile.in
@@ -82,7 +82,7 @@ rakudo-test: rakudo/perl6
rakudo-install: rakudo
cd rakudo && $(MAKE) install
@win32_libparrot_copy@
- $(CP) $(PARROT_BIN_DIR)/$(PERL6_EXE) .
+ $(CP) $(DESTDIR)$(PARROT_BIN_DIR)/$(PERL6_EXE) .
$(CHMOD) 755 $(PERL6_EXE)
modules-install:
diff --git a/skel/build/module-install.pl b/skel/build/module-install.pl
index 3889dfb..63a9412 100644
--- a/skel/build/module-install.pl
+++ b/skel/build/module-install.pl
@@ -29,6 +29,7 @@ while (@ARGV) {
}
}
+chdir 'rakudo';
foreach my $pm (@pmfiles) {
my $out = $pm; $out =~ s/\.pm6?$/.pir/;
my @cmd = ($perl6bin, '--target=pir', "--output=$out", $pm);