diff options
| author | Timo Paulssen <timonator@perpetuum-immobile.de> | 2014-03-17 01:55:13 +0100 |
|---|---|---|
| committer | Timo Paulssen <timonator@perpetuum-immobile.de> | 2014-03-17 01:55:13 +0100 |
| commit | 7be70fd12493ac438f1f492255c51b00a80ef32a (patch) | |
| tree | 5c73bda27e0be7669aaad47d40b7631c39528d72 | |
| parent | dda5873b9651c1c8d3d32a5b1a52ad9156fad5b1 (diff) | |
fix some more problems
| -rw-r--r-- | Configure.pl | 4 | ||||
| -rw-r--r-- | tools/build/Makefile.in | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/Configure.pl b/Configure.pl index d9bca6a..604d015 100644 --- a/Configure.pl +++ b/Configure.pl @@ -110,8 +110,8 @@ MAIN: { $config{backend_exes} = join ' ', map { '$(RAKUDO_DIR)/$(PERL6_' . uc(substr $_, 0, 1) . '_EXE)' } keys %backends; - $config{backend_module_install} = join ' ', map - { 'module-install-' . lc(substr $_, 0, 1) } + $config{backend_modules_install} = join ' ', map + { 'modules-install-' . lc(substr $_, 0, 1) } keys %backends; $config{default_backend_exe} = '$(PERL6_' . uc(substr $default_backend, 0, 1) . diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 25adc43..ac73ab5 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -61,7 +61,7 @@ rakudo-spectest: rakudo rakudo-install: rakudo cd $(RAKUDO_DIR) && $(MAKE) install - $(CP) $(DESTDIR)@default_backend_exe@ $(PERL6_EXE) + $(CP) $(PREFIX_DIR)@default_backend_exe@ $(PERL6_EXE) $(CHMOD) 755 $(PERL6_EXE) @win32_libparrot_copy@ @@ -69,24 +69,24 @@ modules-install: @backend_modules_install@ modules-install-p: @echo "== Installing modules for Parrot" - $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_P_INSTALL) $(DESTDIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) + $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_P_INSTALL) $(PREFIX_DIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) @echo "== Installing binaries for Parrot" - $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(DESTDIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo-p modules/panda/bin/panda-p modules/doc/bin/p6doc-p + $(PERL) tools/build/bin-install.pl $(PERL6_P_INSTALL) $(PREFIX_DIR)$(PARROT_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc 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) + $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_J_INSTALL) $(PREFIX_DIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES) @echo "== Installing binaries for JVM" - $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(DESTDIR)$(JVM_BIN_DIR) modules/ufo/bin/ufo-j modules/panda/bin/panda-j modules/doc/bin/p6doc-j + $(PERL) tools/build/bin-install.pl $(PERL6_J_INSTALL) $(PREFIX_DIR)$(JVM_BIN_DIR) modules/ufo/bin/ufo modules/panda/bin/panda modules/doc/bin/p6doc modules-install-m: @echo "== Installing modules for MoarVM" - $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_M_INSTALL) $(DESTDIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) + $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_M_INSTALL) $(PREFIX_DIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) @echo "== Installing binaries for MoarVM" - $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(DESTDIR)$(MOAR_BIN_DIR) modules/ufo/bin/ufo-m modules/panda/bin/panda-m modules/doc/bin/p6doc-m + $(PERL) tools/build/bin-install.pl $(PERL6_M_INSTALL) $(PREFIX_DIR)$(MOAR_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 + $(PERL) tools/build/modules-test.pl $(CURDIR) $(PREFIX_DIR)$(PERL6_INSTALL) modules/MODULES.txt install: rakudo-install modules-install |