summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam.coldrick@codethink.co.uk>2014-08-15 08:30:56 +0000
committerAdam Coldrick <adam.coldrick@codethink.co.uk>2014-08-15 08:30:56 +0000
commit803387f4cd792982b86d45796fbb4df559d9db44 (patch)
tree6eede12cbc65d343c3b3bfa6f56c6cfa6539675f
parent6148f883107b1a1de18254aa9ffe2fb1be0e1121 (diff)
downloadattr-803387f4cd792982b86d45796fbb4df559d9db44.tar.gz
Revert "Rewrite morphology as YAML, moving "comments" to "description""
This reverts commit 6148f883107b1a1de18254aa9ffe2fb1be0e1121.
-rw-r--r--attr.morph30
1 files changed, 18 insertions, 12 deletions
diff --git a/attr.morph b/attr.morph
index 45a0bbd..2bb14e3 100644
--- a/attr.morph
+++ b/attr.morph
@@ -1,12 +1,18 @@
-name: attr
-kind: chunk
-description: |
- The DESTDIR patch idea comes from: http://pkgs.fedoraproject.org/gitweb/?p=attr.git;a=blob_plain;f=attr-2.4.32-build.patch
-configure-commands:
-- sed -i -e 's,PKG_\\(.*\\)_DIR\\t= ,PKG_\\1_DIR\\t= \\$(DESTDIR),g' include/builddefs.in
-- sed -i -e 's,\\$\\$LOCAL_CONFIGURE_OPTIONS,\\$(LOCAL_CONFIGURE_OPTIONS),g' Makefile
-- make LOCAL_CONFIGURE_OPTIONS="--prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin --bindir=/usr/bin --libdir=/usr/lib --libexecdir=/usr/lib --enable-lib64=yes --includedir=/usr/include --mandir=/usr/share/man --datadir=/usr/share" configure
-build-commands:
-- make SHELL=/bin/bash
-install-commands:
-- make SHELL=/bin/bash DESTDIR="$DESTDIR" install-lib install-dev
+{
+ "name": "attr",
+ "kind": "chunk",
+ "comments": [
+ "The DESTDIR patch idea comes from: http://pkgs.fedoraproject.org/gitweb/?p=attr.git;a=blob_plain;f=attr-2.4.32-build.patch"
+ ],
+ "configure-commands": [
+ "sed -i -e 's,PKG_\\(.*\\)_DIR\\t= ,PKG_\\1_DIR\\t= \\$(DESTDIR),g' include/builddefs.in",
+ "sed -i -e 's,\\$\\$LOCAL_CONFIGURE_OPTIONS,\\$(LOCAL_CONFIGURE_OPTIONS),g' Makefile",
+ "make LOCAL_CONFIGURE_OPTIONS=\"--prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin --bindir=/usr/bin --libdir=/usr/lib --libexecdir=/usr/lib --enable-lib64=yes --includedir=/usr/include --mandir=/usr/share/man --datadir=/usr/share\" configure"
+ ],
+ "build-commands": [
+ "make SHELL=/bin/bash"
+ ],
+ "install-commands": [
+ "make SHELL=/bin/bash DESTDIR=\"$DESTDIR\" install-lib install-dev"
+ ]
+}