summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/build-binary-dist.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/build-binary-dist.sh b/bin/build-binary-dist.sh
index f96831910..02751f40b 100755
--- a/bin/build-binary-dist.sh
+++ b/bin/build-binary-dist.sh
@@ -29,8 +29,8 @@ set -x # print commands before executing them
pushd src/runtime/c
bash setup.sh configure --prefix="$prefix"
bash setup.sh build
+bash setup.sh install prefix="$prefix"
bash setup.sh install prefix="$destdir$prefix"
-libtool --finish "$prefix/lib"
popd
## Build the python binding to the C run-time system
@@ -71,10 +71,10 @@ export DYLD_LIBRARY_PATH="$extralib" LD_LIBRARY_PATH="$extralib"
## Build GF, with C run-time support enabled
cabal install -w "$ghc" --only-dependencies -fserver -fc-runtime $extra
-cabal configure -w "$ghc" --prefix="$destdir$prefix" -fserver -fc-runtime $extra
+cabal configure -w "$ghc" --prefix="$prefix" -fserver -fc-runtime $extra
cabal build
# Building the example grammars will fail, because the RGL is missing
-cabal copy --destdir="$destdir" # create www directory
+cabal v1-copy --destdir="$destdir" # create www directory
## Build the RGL and copy it to $destdir
PATH=$PWD/dist/build/gf:$PATH
@@ -89,7 +89,7 @@ popd
cabal build
## Copy GF to $destdir
-cabal copy --destdir="$destdir"
+cabal v1-copy --destdir="$destdir"
libdir=$(dirname $(find "$destdir" -name PGF.hi))
cabal register --gen-pkg-config=$libdir/gf-$ver.conf