From 786ece4752468ddedd333ac5ee42de992848fa47 Mon Sep 17 00:00:00 2001 From: Mouq Date: Sun, 16 Mar 2014 21:15:24 -0400 Subject: fix some less problems DESTDIR should still be there, by de facto Makefile law, AFAICT --- tools/build/Makefile.in | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tools') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index ac73ab5..27e1199 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -16,10 +16,10 @@ PARROT_VERSION = @versiondir@ PARROT_LIB_DIR = @libdir@$(PARROT_VERSION) # JVM install location -JVM_BIN_DIR = $(PREFIX)/bin +JVM_BIN_DIR = $(PREFIX_DIR)/bin # MoarVM install location -MOAR_BIN_DIR = $(PREFIX)/bin +MOAR_BIN_DIR = $(PREFIX_DIR)/bin EXE = @exe@ BAT = @bat@ @@ -34,11 +34,11 @@ PERL6_P_LANG_DIR = $(PARROT_LIB_DIR)/languages/perl6 PERL6_P_INSTALL = $(PARROT_BIN_DIR)/$(PERL6_P_EXE) PERL6_J_EXE = perl6-j$(BAT) -PERL6_J_LANG_DIR = $(PREFIX)/languages/perl6 +PERL6_J_LANG_DIR = $(PREFIX_DIR)/languages/perl6 PERL6_J_INSTALL = $(JVM_BIN_DIR)/$(PERL6_J_EXE) PERL6_M_EXE = perl6-m$(BAT) -PERL6_M_LANG_DIR = $(PREFIX)/languages/perl6 +PERL6_M_LANG_DIR = $(PREFIX_DIR)/languages/perl6 PERL6_M_INSTALL = $(MOAR_BIN_DIR)/$(PERL6_M_EXE) PERL6_EXE = perl6$(EXE) @@ -61,7 +61,7 @@ rakudo-spectest: rakudo rakudo-install: rakudo cd $(RAKUDO_DIR) && $(MAKE) install - $(CP) $(PREFIX_DIR)@default_backend_exe@ $(PERL6_EXE) + $(CP) $(DESTDIR)@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 $(PREFIX_DIR)$(PERL6_P_INSTALL) $(PREFIX_DIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) + $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_P_INSTALL) $(DESTDIR)$(PERL6_P_LANG_DIR)/lib pir pir $(MODULES) @echo "== Installing binaries for Parrot" - $(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 + $(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 modules-install-j: @echo "== Installing modules for JVM" - $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_J_INSTALL) $(PREFIX_DIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES) + $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_J_INSTALL) $(DESTDIR)$(PERL6_J_LANG_DIR)/lib jar jar $(MODULES) @echo "== Installing binaries for JVM" - $(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 + $(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 modules-install-m: @echo "== Installing modules for MoarVM" - $(PERL) tools/build/module-install.pl $(PREFIX_DIR)$(PERL6_M_INSTALL) $(PREFIX_DIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) + $(PERL) tools/build/module-install.pl $(DESTDIR)$(PERL6_M_INSTALL) $(DESTDIR)$(PERL6_M_LANG_DIR)/lib moarvm mbc $(MODULES) @echo "== Installing binaries for MoarVM" - $(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 + $(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 modules-test: - $(PERL) tools/build/modules-test.pl $(CURDIR) $(PREFIX_DIR)$(PERL6_INSTALL) modules/MODULES.txt + $(PERL) tools/build/modules-test.pl $(CURDIR) $(DESTDIR)$(PERL6_INSTALL) modules/MODULES.txt install: rakudo-install modules-install -- cgit v1.1 From 4a394218f093b51c8137904488cbae4188d68ced Mon Sep 17 00:00:00 2001 From: Mouq Date: Sun, 16 Mar 2014 23:14:04 -0400 Subject: Let ufo, panda, and p6doc figure out what they're running on --- tools/build/Makefile.in | 6 +++--- tools/build/bin-install.pl | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) (limited to 'tools') diff --git a/tools/build/Makefile.in b/tools/build/Makefile.in index 27e1199..1a4928f 100644 --- a/tools/build/Makefile.in +++ b/tools/build/Makefile.in @@ -71,19 +71,19 @@ 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) @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) $(DESTDIR)$(PARROT_BIN_DIR) p 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) @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) $(DESTDIR)$(JVM_BIN_DIR) j 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) @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) $(DESTDIR)$(MOAR_BIN_DIR) m 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 diff --git a/tools/build/bin-install.pl b/tools/build/bin-install.pl index 1c71cea..1b47942 100644 --- a/tools/build/bin-install.pl +++ b/tools/build/bin-install.pl @@ -4,7 +4,7 @@ use strict; use warnings; use File::Spec; -my ($p6bin, $dest, @files) = @ARGV; +my ($p6bin, $dest, $post, @files) = @ARGV; die "Usage: $0 " unless $p6bin && $dest; @@ -25,4 +25,12 @@ for my $filename (@files) { close $OUT or die "Error while closing file '$dest/$basename': $!"; close $IN; chmod 0755, "$dest/$basename"; + open my $ALIAS, '>', "$dest/$basename-$post" + or die "Cannot write file '$dest/$basename-$post' for installing it: $!"; + printf { $ALIAS } <<'EOA', $p6bin, $dest, $basename; +#!/bin/sh +exec %s %s/%s "$@" +EOA + close $ALIAS or die "Error while closing file '$dest/$basename-$post': $!"; + chmod 0755, "$dest/$basename-$post"; } -- cgit v1.1