summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-02-13 15:59:19 +0000
committerEdward Cragg <edward.cragg@codethink.co.uk>2015-02-17 11:01:20 +0000
commit6b4ea631b8729075dbcf639841fb679befb872ac (patch)
treeb25fb751944832866d605ed50073c9a138abc38d
parent0578e13551a3fc5179636f8b965a99b1c693b495 (diff)
downloaddefinitions-6b4ea631b8729075dbcf639841fb679befb872ac.tar.gz
strata/ruby: update config.{guess,sub}
Also set explicitly the build system to use, move autoconf to the pre-configure-commands section, and remove the now redundant 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