aboutsummaryrefslogtreecommitdiff
path: root/tools/build/Makefile.in
diff options
context:
space:
mode:
authorPatrick R. Michaud <pmichaud@pobox.com>2012-12-29 10:51:21 -0800
committerPatrick R. Michaud <pmichaud@pobox.com>2012-12-29 10:51:21 -0800
commit173db4634aca5c2077ff09167cc257f365fbe210 (patch)
tree29d8106df7ee12d578af8b9b5423d384c2c615ba /tools/build/Makefile.in
parent0feb3a0a634b415c2a4bef9bf7525e78425ea268 (diff)
parentb2e6559a64bc16f0fbac1fd93911e61a8c30f4e4 (diff)
Merge pull request #17 from hoelzro/master
Make building RPMS and other Linux packages easier
Diffstat (limited to 'tools/build/Makefile.in')
-rw-r--r--tools/build/Makefile.in6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in
index 172de12..7c169c1 100644
--- a/tools/build/Makefile.in
+++ b/tools/build/Makefile.in
@@ -79,7 +79,7 @@ modules-install: rakudo-install
@echo "== Installing modules"
$(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_INSTALL) $(DESTDIR)$(PERL6_LANG_DIR)/lib $(MODULES)
@echo "== Installing binaries"
- $(PERL) tools/build/bin-install.pl $(DESTDIR)$(PERL6_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc
+ $(PERL) tools/build/bin-install.pl $(PERL6_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc
modules-test:
$(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt
@@ -88,8 +88,10 @@ perl6-debug: $(RD_EXE)
$(RD_EXE): modules-install
$(NQP_EXE) --vmlibs=perl6_group,perl6_ops --target=pir \
+ --dynext=$(DESTDIR)$(PARROT_LIB_DIR)/dynext/ \
+ --module-path=$(DESTDIR)$(PARROT_LIB_DIR)/languages/nqp/lib \
--output=$(RD_PIR) $(RD_DIR)/bin/perl6-debug.nqp
- $(PARROT_EXE) -o $(RD_PBC) $(RD_PIR)
+ $(PARROT_EXE) --dynext $(DESTDIR)$(PARROT_LIB_DIR)/dynext/ -o $(RD_PBC) $(RD_PIR)
$(PBC_TO_EXE) $(RD_PBC)
$(CHMOD) 755 $(RD_EXE)