diff options
Diffstat (limited to 'tools/build')
| -rw-r--r-- | tools/build/Makefile.in | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 961877e..e4352a6 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -43,8 +43,11 @@ PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE) PERL6_EXE = perl6$(EXE) +<<<<<<< HEAD +======= MODULES = modules/MODULES.txt +>>>>>>> origin/tristar all: rakudo rakudo: @backend_exes@ @@ -73,6 +76,8 @@ modules-install-p: @echo "== Installing binaries for Parrot" $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) p modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc +<<<<<<< HEAD +======= modules-install-j: @echo "== Installing modules for JVM" $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_J_INSTALL) $(DESTDIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES) @@ -96,6 +101,7 @@ modules-test-j: modules-test-m: $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) modules/MODULES.txt +>>>>>>> origin/tristar install: rakudo-install modules-install test: |