summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-02-13 15:59:19 +0000
committerTiago Gomes <tiago.gomes@codethink.co.uk>2015-02-17 09:39:13 +0000
commit99204f9242868236bcf9ba9b7ccaf02e6d04c343 (patch)
treeb25fb751944832866d605ed50073c9a138abc38d
parentcbaeec787bc8bcf26bb96ab48780c6bf532bbc22 (diff)
downloaddefinitions-99204f9242868236bcf9ba9b7ccaf02e6d04c343.tar.gz
strata/ruby: update config.{guess,sub} scripts
Also explicitly tell which build system to use, move autoconf to be a pre-configure-command and remove build-commands and install-commands sections.
-rw-r--r--strata/ruby/ruby-1.8.morph10
-rw-r--r--strata/ruby/ruby.morph10
2 files changed, 10 insertions, 10 deletions
diff --git a/strata/ruby/ruby-1.8.morph b/strata/ruby/ruby-1.8.morph
index cee282c0..4554e441 100644
--- a/strata/ruby/ruby-1.8.morph
+++ b/strata/ruby/ruby-1.8.morph
@@ -1,9 +1,9 @@
name: ruby-1.8
kind: chunk
-configure-commands:
+build-system: autotools
+pre-configure-commands:
+- cp /usr/share/automake*/config.guess .
+- cp /usr/share/automake*/config.sub .
- autoconf
+configure-commands:
- ./configure --prefix=/usr --program-suffix=-1.8
-build-commands:
-- make
-install-commands:
-- make DESTDIR="$DESTDIR" install
diff --git a/strata/ruby/ruby.morph b/strata/ruby/ruby.morph
index c5d4afe1..f9f0ae7c 100644
--- a/strata/ruby/ruby.morph
+++ b/strata/ruby/ruby.morph
@@ -1,9 +1,9 @@
name: ruby
kind: chunk
-configure-commands:
+build-system: autotools
+pre-configure-commands:
+- cp /usr/share/automake*/config.guess tool
+- cp /usr/share/automake*/config.sub tool
- autoconf
+configure-commands:
- ./configure --prefix=/usr --enable-shared --with-baseruby=/usr/bin/ruby-1.8
-build-commands:
-- make
-install-commands:
-- make DESTDIR=$DESTDIR install