diff options
| author | gerd <gp@zimt.uni-siegen.de> | 2015-06-24 15:45:54 +0200 |
|---|---|---|
| committer | Tobias Leich <email@froggs.de> | 2015-06-29 20:29:10 +0200 |
| commit | 1cc0f0adceda03f3458206eb4bb661f1a60aff5c (patch) | |
| tree | fa21c8ccb99825d06c83faeeb1ff6dfe889e2e61 | |
| parent | a55705bbdfff67e0c5dfb76c919fc7c481f0b857 (diff) | |
languages -> share
| -rw-r--r-- | tools/build/Makefile.in | 12 | ||||
| -rw-r--r-- | tools/build/panda-state.p6 | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 0dd1735..5f74c39 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -23,11 +23,11 @@ MKPATH = $(PERL) -MExtUtils::Command -e mkpath CHMOD = $(PERL) -MExtUtils::Command -e chmod PERL6_J_EXE = perl6-j$(BAT) -PERL6_J_LANG_DIR = $(PREFIX_DIR)/languages/perl6 +PERL6_J_LANG_DIR = $(PREFIX_DIR)/share/perl6 PERL6_J_INSTALL = $(JVM_BIN_DIR)/$(PERL6_J_EXE) PERL6_M_EXE = perl6-m$(BAT) -PERL6_M_LANG_DIR = $(PREFIX_DIR)/languages/perl6 +PERL6_M_LANG_DIR = $(PREFIX_DIR)/share/perl6 PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE) PERL6_EXE = perl6$(EXE) @@ -62,8 +62,8 @@ modules-install-j: $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) j modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) j modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc-index $(MKPATH) $(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/ - $(CP) install/languages/perl6/site/panda/projects.json $(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/ - $(CP) install/languages/perl6/site/panda/state $(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/ + $(CP) install/share/perl6/site/panda/projects.json $(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/ + $(CP) install/share/perl6/site/panda/state $(DESTDIR)$(PERL6_J_LANG_DIR)/site/panda/ modules-install-m: @echo "== Installing modules for MoarVM" @@ -72,8 +72,8 @@ modules-install-m: $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) m modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) m modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc-index $(MKPATH) $(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/ - $(CP) install/languages/perl6/site/panda/projects.json $(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/ - $(CP) install/languages/perl6/site/panda/state $(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/ + $(CP) install/share/perl6/site/panda/projects.json $(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/ + $(CP) install/share/perl6/site/panda/state $(DESTDIR)$(PERL6_M_LANG_DIR)/site/panda/ modules-test: @backend_modules_test@ verbose-modules-test: @backend_modules_test@ diff --git a/tools/build/panda-state.p6 b/tools/build/panda-state.p6 index 63f0316..e5f809b 100644 --- a/tools/build/panda-state.p6 +++ b/tools/build/panda-state.p6 @@ -1,12 +1,12 @@ try mkdir 'install'; -try mkdir 'install/languages'; -try mkdir 'install/languages/perl6'; -try mkdir 'install/languages/perl6/site'; -try mkdir 'install/languages/perl6/site/panda'; +try mkdir 'install/share'; +try mkdir 'install/share/perl6'; +try mkdir 'install/share/perl6/site'; +try mkdir 'install/share/perl6/site/panda'; -my $state-file = 'install/languages/perl6/site/panda/state'; -my $projects-file = 'install/languages/perl6/site/panda/projects.json'; +my $state-file = 'install/share/perl6/site/panda/state'; +my $projects-file = 'install/share/perl6/site/panda/projects.json'; fetch-projects-json($projects-file); @@ -14,9 +14,9 @@ my $projects = from-json $projects-file.IO.slurp; # In case we ship a project that is just a fork of a project listed in the ecosystem, add # the mapping here. -my %ex = +my %ex; # 'git://github.com/FROGGS/perl6-digest-md5' => 'git://github.com/cosimo/perl6-digest-md5', -Nil; +#Nil; # Walk the submodules and put its project information in panda's state file. my $fh = $state-file.IO.open(:w); |