summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-04-18 17:25:35 +0100
committerRichard Maw <richard.maw@codethink.co.uk>2012-04-18 17:32:30 +0100
commit417a5bd63954aeb3257bbe8b1bdab42c4cc22279 (patch)
tree352a5a207ceb074326bc9863aa67ac47d56cbcb6
parenta8bfc7a5e8a7b12cefe35e9ee604c65e905813e6 (diff)
downloadbzip2-417a5bd63954aeb3257bbe8b1bdab42c4cc22279.tar.gz
bzip2.morph: also build the shared library
Why doesn't it build it by default?
-rw-r--r--bzip2.morph6
-rw-r--r--libbz2.morph10
2 files changed, 4 insertions, 12 deletions
diff --git a/bzip2.morph b/bzip2.morph
index 83a13c1..6e2e44f 100644
--- a/bzip2.morph
+++ b/bzip2.morph
@@ -2,9 +2,11 @@
"name": "bzip2",
"kind": "chunk",
"build-commands": [
- "make"
+ "make",
+ "make -f Makefile-libbz2_so"
],
"install-commands": [
- "make PREFIX=\"$DESTDIR${PREFIX-/usr}\" install"
+ "make PREFIX=\"$DESTDIR$PREFIX\" install",
+ "install libbz2.so* \"$DESTDIR$PREFIX/lib\""
]
}
diff --git a/libbz2.morph b/libbz2.morph
deleted file mode 100644
index 3497719..0000000
--- a/libbz2.morph
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "name": "libbz2",
- "kind": "chunk",
- "build-commands": [
- "make -f Makefile-libbz2_so"
- ],
- "install-commands": [
- "install libbz2.so.1.0 libbz2.so.1.0.6 \"$DESTDIR${PREFIX-/usr}/lib\""
- ]
-}