X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=build;h=c1f039fd8aa96c19369207e049b1d4e071d0be7f;hp=c77b02430371ca51ce57b72380f889e7f321a99d;hb=92504303416dfc46f1a4e4ed45ddd3203919cf8f;hpb=0c0ad44ac6376d9bfb2b84d5f2293d945130ab45

diff --git a/build b/build
index c77b024..c1f039f 100755
--- a/build
+++ b/build
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 file="pdns-pipe-nmc"
-sfx="linux-glibc6.`uname -m`.`date +%Y-%m-%d`.git-`git rev-parse --verify HEAD | cut -c 1-7`"
+sfx="linux-glibc6.`uname -m`.`date +%Y-%m-%d`.git-`git describe`"
 echo "Making $file.$sfx"
 
 # tried this:
@@ -9,10 +9,16 @@ echo "Making $file.$sfx"
 #           -optl-pthread -pgml g++ "$file"
 # but cannot make it "only glibc is shared". And with static glibc,
 # getaddrinfo does not work on systems with different glibc.
-ghc --make "$file"
+#
+# To build with ghc, run this:
+#ghc --make -optP-include -optPdist/build/autogen/cabal_macros.h "$file"
+# but it is still necessary to run `cabal configure` before to generate
+# the file `dist/build/autogen/cabal_macros.h`.
+
+cabal build
 case $? in
 0) ;;
 *) echo build falied; exit 1 ;;
 esac
-mv "$file" "$file.$sfx" || exit 1
+mv "dist/build/$file/$file" "$file.$sfx" || exit 1
 gpg --detach-sign "$file.$sfx"