From 5d804c4e841f410724621bb722af02add93c28ea Mon Sep 17 00:00:00 2001 From: Rob Hoelz Date: Wed, 19 Dec 2012 00:39:32 +0100 Subject: Remove DESTDIR prefix from bin-install line If using DESTDIR to package up Rakudo Star in an RPM or similar format, the Makefile currently ends up writing the package build directory into the shebang line of the installed scripts. This is probably not a good idea. --- tools/build/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 3ab27ed..a617ed8 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 -- cgit v1.1 From cd13191486f8528c1206aca0df152d7dcb995a12 Mon Sep 17 00:00:00 2001 From: Rob Hoelz Date: Thu, 20 Dec 2012 22:33:54 +0100 Subject: Explicitly specify module path when building debugger --- tools/build/Makefile.in | 1 + 1 file changed, 1 insertion(+) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index a617ed8..835218b 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -88,6 +88,7 @@ perl6-debug: $(RD_EXE) $(RD_EXE): modules-install $(NQP_EXE) --vmlibs=perl6_group,perl6_ops --target=pir \ + --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) $(PBC_TO_EXE) $(RD_PBC) -- cgit v1.1 From b2e6559a64bc16f0fbac1fd93911e61a8c30f4e4 Mon Sep 17 00:00:00 2001 From: Rob Hoelz Date: Thu, 20 Dec 2012 23:34:09 +0100 Subject: Set --dynext when building debugger This requires a fairly new version of NQP --- tools/build/Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools/build/Makefile.in') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 835218b..fcc6987 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -88,9 +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) -- cgit v1.1