Skip to content

Commit

Permalink
be more consistent with build locations
Browse files Browse the repository at this point in the history
  • Loading branch information
moritz committed Jul 26, 2011
1 parent 9da32b2 commit f74a171
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions blib/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.pbc
*.pir
1 change: 1 addition & 0 deletions blib/Perl6/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.pbc
*.pir
8 changes: 5 additions & 3 deletions tools/build/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ CLEANUPS = \
blib/*.pir \
blib/*.pbc \
blib/*.pm \
blib/Perl6/*.pbc \
blib/Perl6/*.pir \
$(PMC_DIR)/pmc_*.h \
$(PMC_DIR)/*.c \
$(PMC_DIR)/*.dump \
Expand Down Expand Up @@ -256,7 +258,7 @@ install: all
$(CP) $(DYNPMC) $(DYNOPS) $(DESTDIR)$(PARROT_LIB_DIR)/dynext
$(MKPATH) $(DESTDIR)$(PARROT_BIN_DIR)
$(CP) $(PERL6_EXE) $(DESTDIR)$(PARROT_BIN_DIR)
$(CHMOD) 755 $(DESTDIR)$(PARROT_BIN_DIR)/$(PERL6_EXE)
$(CHMOD) 755 $(DESTDIR)$(PARROT_BIN_DIR)/perl6$(EXE)
$(MKPATH) $(DESTDIR)$(DOCDIR)/rakudo
$(MKPATH) $(DESTDIR)$(DOCDIR)/rakudo/announce
$(CP) $(DOCS) $(DESTDIR)$(DOCDIR)/rakudo
Expand All @@ -274,9 +276,9 @@ $(PERL6_EXE): $(PERL6_PBC)
# the complete compiler, including core/setting
$(PERL6_PBC): $(PERL6_G_PBC) $(PERL6_A_PBC) $(PERL6_C_PBC) src/main.nqp
$(PERL) tools/build/gen-version.pl >src/gen/main-version.nqp
$(NQP_EXE) --vmlibs=perl6_group,perl6_ops --target=pir --output=src/gen/perl6.pir \
$(NQP_EXE) --vmlibs=perl6_group,perl6_ops --target=pir --output=$(PERL6_PIR) \
--combine src/main.nqp src/gen/main-version.nqp
$(PARROT) $(PARROT_ARGS) -o $(PERL6_PBC) src/gen/perl6.pir
$(PARROT) $(PARROT_ARGS) -o $(PERL6_PBC) $(PERL6_PIR)

$(PERL6_ML_PBC): $(NQP_EXE) $(DYNEXT_TARGET) src/Perl6/ModuleLoader.pm
$(NQP_EXE) --target=pir --output=$(PERL6_ML) --encoding=utf8 \
Expand Down

0 comments on commit f74a171

Please sign in to comment.