X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=Goalfile.in;h=7dca26fba93f7b006145b9e35c112ded81d58222;hb=refs%2Fheads%2Fmaster;hp=9126723c8cfbe085ae3e1695bd6fb1bbd35bac39;hpb=54c8ad92025a9c77c2b10644499b3944e1299187;p=goals.git

diff --git a/Goalfile.in b/Goalfile.in
index 9126723..7dca26f 100644
--- a/Goalfile.in
+++ b/Goalfile.in
@@ -92,7 +92,7 @@ goal tool = : ocaml_link ("src/goals", objects) ;
 
 # Parser.
 "src/parser.mli", "src/parser.ml" : "src/parser.mly" {
-    %MENHIR --explain %<
+    %MENHIR --explain --code-ancient %<
     # Hack required to break circular dependencies.
     echo 'val lexer_read : (Lexing.lexbuf -> token) option ref' >> src/parser.mli
     echo 'val eval_substitute : (Ast.env -> Ast.loc -> Ast.substs -> string) option ref' >> src/parser.mli
@@ -179,10 +179,14 @@ goal install = {
     # exec_prefix die die die
     bindir="@prefix@/bin"
     datadir="@prefix@/share"
+    mandir="$datadir/man"
     mkdir -p %DESTDIR"$bindir"
-    mkdir -p %DESTDIR"$datadir/goals"
+    mkdir -p %DESTDIR"$datadir/goals/stdlib"
+    mkdir -p %DESTDIR"$mandir/man1" %DESTDIR"$mandir/man5"
     install src/goals %DESTDIR"$bindir" -m 0755
-    install %stdlibfiles %DESTDIR"$datadir"/goals -m 644
+    install %stdlibfiles %DESTDIR"$datadir"/goals/stdlib -m 644
+    install man/*.1 %DESTDIR"$mandir"/man1/ -m 644
+    install man/*.5 %DESTDIR"$mandir"/man5/ -m 644
 }
 
 #----------------------------------------------------------------------
@@ -218,10 +222,13 @@ let distfiles = [
     ".gitignore",
     "COPYING",
     "Goalfile.in",
+    "Makefile.am",
     "Makefile.in",
     "README",
     "TODO",
+    "aclocal.m4",
     "autogen.sh",
+    "compile",
     "config.h.in",
     "configure",
     "configure.ac",
@@ -229,6 +236,7 @@ let distfiles = [
     "goals.spec.in",
     "install-sh",
     "m4/ocaml.m4",
+    "missing",
     "run.in",
     "src/.depend",
     sources,
@@ -257,6 +265,11 @@ goal dist = "%tarfile" : {
         mkdir -p "$d/$subdir"
         cp -a "$f" "$d/$subdir"
     done
+    # Replace $d/install-sh with a real file
+    if [ -L "$d/install-sh" ]; then
+        rm "$d/install-sh"
+        cp -L "install-sh" "$d/install-sh"
+    fi
     tar zcf "$o-t" "$d"
     mv "$o-t" "$o"
     rm -rf "$d"
@@ -309,7 +322,7 @@ goal maintainer-release = : dist,
 
 let websitedir = "%HOME/d/websites/people.redhat.com/goals"
 
-# XXX Should actually use the *url tactic here.
+# XXX Should actually use the is-url predicate here.
 goal maintainer-upload = : distcheck {
     [ -d %websitedir ]
     cp %tarfile %websitedir/files