summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Doffman <mark.doffman@codethink.co.uk>2014-03-18 18:55:22 +0000
committerMark Doffman <mark.doffman@codethink.co.uk>2014-03-21 01:46:23 +0000
commit52fc681857228c65c1cb439782da485554875481 (patch)
tree6456cd68d4daf5fe2166f22b300904ce2c2db867
parentb916266677b862fe21f0e1b4d4552ebccf75d47e (diff)
downloadyajl-52fc681857228c65c1cb439782da485554875481.tar.gz
Fix build issues in baserock.baserock/morph
Fix improper top level makefile. Update morph file removing description of this CMake project as 'autotools'
-rwxr-xr-xconfigure12
-rw-r--r--yajl.morph5
2 files changed, 9 insertions, 8 deletions
diff --git a/configure b/configure
index 716e7d1..5383661 100755
--- a/configure
+++ b/configure
@@ -52,26 +52,26 @@ cat > ./Makefile <<EOS
all: distro doc test test-api
distro:
- @cd build && make
+ @cd build && \$(MAKE)
doc:
- @cd build && make doc
+ @cd build && \$(MAKE) doc
test:
- @cd build && make test
+ @cd build && \$(MAKE) test
test-api:
- @cd build && make test-api
+ @cd build && \$(MAKE) test-api
clean:
- @cd build && make clean
+ @cd build && \$(MAKE) clean
distclean:
@rm -rf Makefile build
@rm -f yajl-*.tgz
install: distro doc
- @cd build && make install
+ @cd build && \$(MAKE) install
package: all
@echo \"compressing to $(basename build/yajl-*).tgz\"
diff --git a/yajl.morph b/yajl.morph
index 9222c6d..3fac99d 100644
--- a/yajl.morph
+++ b/yajl.morph
@@ -1,7 +1,8 @@
name: yajl
kind: chunk
-build-system: autotools
configure-commands:
- ./configure -p "$PREFIX"
build-commands:
-- make
+- make distro
+install-commands:
+- make install DESTDIR="$DESTDIR"