# 
# patch "Makefile"
#  from [c93ddc0881977ec81a5ea63fcd60242c3dc7a89d]
#    to [708d8e7dcb45b060fa892a40b91495e259c3fd36]
# 
# patch "README"
#  from [79507ad7ece9961e199537596e789bb725856fac]
#    to [90c6b1e59affd24a1a0fcc844980140dd518e456]
# 
# patch "configure.ac"
#  from [029ca43d56d8741f33ad5377bfc282a47d959412]
#    to [43c8ff541d8d9b3c7a01992b0f3678649dcf001e]
# 
--- Makefile
+++ Makefile
@@ -116,8 +116,7 @@
         tar zcvf $(@F) $(addprefix $(NAME)-$(VERSION)/,$(DISTSRC)) && \
         mv $(NAME)-$(VERSION) "$$DIRNAME"
 
+# not config.make
+ifndef OCAMLLEX
+$(error run ./configure first (cf README))
+endif
-config.make : config.make.in configure
-	$(error run ./configure)
-configure : configure.ac
-	aclocal -I .
-	autoconf
--- README
+++ README
@@ -23,7 +23,7 @@
 =========
 - compile/install ocaml and LablGTK
 - if you've pulled this from the monotone repository,
-  run make a first time to generate the configure script
+  run `aclocal -I . && autoconf' to generate configure
 - run ./configure, with the following options if needed :
     --with-monotone-dir
     --with-lablgtk-dir
--- configure.ac
+++ configure.ac
@@ -12,8 +12,11 @@
 AC_CHECK_OCAML_MODULE(lablgtk, LABLGTK_DIR, GFile, +lablgtk2 +lablgtk)
 # Stop if LablGTK is not found
 if test -z "$LABLGTK_DIR" ; then
-  AC_MSG_ERROR([dnl
-Could not find LablGTK. Make sure LablGTK >= 2.4.0 is installed and specify its location to configure with the `--with-lablgtk-dir' option.])
+  AC_MSG_ERROR([
+
+Could not find LablGTK. Make sure LablGTK >= 2.4.0 is installed and
+specify its location to configure with the `--with-lablgtk-dir'
+option.])
 fi
 LABLGTK_DIR=$(echo $LABLGTK_DIR | sed "address@hidden@$OCAMLLIB/@")
 # Check if LablGTK was compiled with libgnomecanvas support
@@ -21,8 +24,10 @@
 if test -r "$LABLGTK_DIR/lablgnomecanvas.cma" ; then
   AC_MSG_RESULT(found)
 else
-  AC_MSG_ERROR([dnl
-libgnomecanvas support not found. LablGTK need to be built with GnomeCanvas support.])
+  AC_MSG_ERROR([
+
+libgnomecanvas support not found.
+LablGTK need to be built with GnomeCanvas support.])
 fi
 # Check if LablGTK is natively compiled
 if test -r "$LABLGTK_DIR/lablgtk.cmxa" -a -r "$LABLGTK_DIR/lablgnomecanvas.cmxa"; then
@@ -43,8 +48,12 @@
 if test -d "$MONOTONE_DIR" -a -r "$MONOTONE_DIR/sqlite/lib3rdparty_a-main.o" ; then
   AC_MSG_RESULT(found in $MONOTONE_DIR/sqlite)
 else
-  AC_MSG_ERROR([dnl
-Could not find compiled sqlite sources. Monotone-viz needs a compiled monotone tree for the sqlite library. Create a link named `monotone' or specify the location to configure using the `--with-monotone-dir' option.])
+  AC_MSG_ERROR([
+
+Could not find compiled sqlite sources. Monotone-viz needs a compiled
+monotone tree for the sqlite library. Create a link named `monotone'
+or specify the location to configure using the `--with-monotone-dir'
+option.])
 fi
 if test "${MONOTONE_DIR:0:1}" != "/" ; then
   MONOTONE_DIR=$PWD/$MONOTONE_DIR