diff options
| author | Tobias Leich <email@froggs.de> | 2014-04-02 16:40:56 +0200 |
|---|---|---|
| committer | Tobias Leich <email@froggs.de> | 2014-04-02 16:41:10 +0200 |
| commit | f79eaed04e7027591c83ac01120a170d277eaee3 (patch) | |
| tree | a72e07ed5c604df510fcac3a7d35615a2534e28d | |
| parent | 0757d2671e23f8e10e92c11910c1a3a56a352a3c (diff) | |
fix VCS conflict
| -rw-r--r-- | tools/build/Makefile.in | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index ca588cc..afd3d5b 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -42,11 +42,8 @@ PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE) PERL6_EXE = perl6$(EXE) -<<<<<<< HEAD -======= -MODULES = modules/MODULES.txt +MODULES = modules/MODULES.txt ->>>>>>> origin/tristar all: rakudo rakudo: @backend_exes@ @@ -75,8 +72,6 @@ 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) @@ -92,15 +87,14 @@ modules-install-m: modules-test: @backend_modules_test@ modules-test-p: - $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_P_INSTALL) modules/MODULES.txt + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_P_INSTALL) $(MODULES) modules-test-j: - $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_J_INSTALL) modules/MODULES.txt + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_J_INSTALL) $(MODULES) modules-test-m: - $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) modules/MODULES.txt + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_M_INSTALL) $(MODULES) ->>>>>>> origin/tristar install: rakudo-install modules-install test: |