NuSMV-build.patch

   1 diff -ur NuSMV-2.4.0/nusmv/doc/html/Makefile.am NuSMV-2.4.0-ok/nusmv/doc/html/Makefile.am
   2 --- NuSMV-2.4.0/nusmv/doc/html/Makefile.am      2005-03-03 12:05:28.000000000 +0100
   3 +++ NuSMV-2.4.0-ok/nusmv/doc/html/Makefile.am   2006-10-03 17:30:35.000000000 +0200
   4 @@ -46,7 +46,7 @@
   5  docs: helpfiles
   6
   7  helpfiles:
   8 -       cd $(top_builddir) && $(SHELL) helpers/extract_doc .
   9 +       cd $(top_builddir) && /bin/bash helpers/extract_doc .
  10
  11  install: docs install-am
  12
  13 diff -ur NuSMV-2.4.0/nusmv/doc/tutorial/Makefile.am NuSMV-2.4.0-ok/nusmv/doc/tutorial/Makefile.am
  14 --- NuSMV-2.4.0/nusmv/doc/tutorial/Makefile.am  2005-05-09 10:30:18.000000000 +0200
  15 +++ NuSMV-2.4.0-ok/nusmv/doc/tutorial/Makefile.am       2006-10-03 17:03:50.000000000 +0200
  16 @@ -62,7 +62,7 @@
  17
  18  if HAVE_LATEX
  19  install-data-local: tutorial.ps
  20 -       $(install_sh_DATA) tutorial.ps $(datadir)/nusmv/doc/tutorial.ps
  21 +       $(install_sh_DATA) tutorial.ps $(DESTDIR)$(datadir)/nusmv/doc/tutorial.ps
  22
  23  else
  24  install-data-local:
  25 diff -ur NuSMV-2.4.0/nusmv/doc/user-man/Makefile.am NuSMV-2.4.0-ok/nusmv/doc/user-man/Makefile.am
  26 --- NuSMV-2.4.0/nusmv/doc/user-man/Makefile.am  2005-10-26 11:11:25.000000000 +0200
  27 +++ NuSMV-2.4.0-ok/nusmv/doc/user-man/Makefile.am       2006-10-03 17:04:09.000000000 +0200
  28 @@ -67,7 +67,7 @@
  29
  30  if HAVE_LATEX
  31  install-data-local: nusmv.ps
  32 -       $(install_sh_DATA) nusmv.ps $(datadir)/nusmv/doc/nusmv.ps
  33 +       $(install_sh_DATA) nusmv.ps $(DESTDIR)$(datadir)/nusmv/doc/nusmv.ps
  34  else
  35  install-data-local:
  36         @echo Cannot generate manual: latex not found
  37 diff -ur NuSMV-2.4.0/nusmv/helpers/extract_doc.in NuSMV-2.4.0-ok/nusmv/helpers/extract_doc.in
  38 --- NuSMV-2.4.0/nusmv/helpers/extract_doc.in    2005-03-03 13:12:59.000000000 +0100
  39 +++ NuSMV-2.4.0-ok/nusmv/helpers/extract_doc.in 2006-10-03 17:29:10.000000000 +0200
  40 @@ -1,4 +1,4 @@
  41 -#!/bin/sh
  42 +#!/bin/bash
  43
  44  # FileName     [ extract_doc.in ]
  45  #
  46 --- NuSMV-2.4.3/cudd-2.4.1.0/Makefile.orig      2007-05-10 19:37:13.000000000 +0200
  47 +++ NuSMV-2.4.3/cudd-2.4.1.0/Makefile   2007-09-14 15:33:55.000000000 +0200
  48 @@ -55,7 +55,7 @@
  49  # These four are typical settings for optimized code with gcc.  The
  50  # last two also work with icc/ecc.
  51  #ICFLAGS       = -g -O6 -Wall
  52 -ICFLAGS        = -g -O6
  53 +#ICFLAGS       = -g -O6
  54  #ICFLAGS       = -g -O3 -Wall
  55  #ICFLAGS       = -g -O3
  56
  57 @@ -69,7 +69,7 @@
  58  # Gcc 2.8.1 or higher on i686.
  59  #XCFLAGS       = -mcpu=pentiumpro -malign-double -DHAVE_IEEE_754 -DBSD
  60  # Gcc 3.2.2 or higher on i686.
  61 -XCFLAGS        = -mcpu=pentium4 -malign-double -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4
  62 +XCFLAGS        = -malign-double -DHAVE_IEEE_754 -DBSD -DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4
  63  # Icc on i686.
  64  #XCFLAGS       = -ansi -align -ip -DHAVE_IEEE_754 -DBSD
  65  # Gcc on ia64.
  66 --- NuSMV-2.4.3/cudd-2.4.1.0/Makefile_64bit~    2007-03-14 11:31:56.000000000 +0100
  67 +++ NuSMV-2.4.3/cudd-2.4.1.0/Makefile_64bit     2007-09-14 15:35:25.000000000 +0200
  68 @@ -55,7 +55,7 @@
  69  # These four are typical settings for optimized code with gcc.  The
  70  # last two also work with icc/ecc.
  71  #ICFLAGS       = -g -O6 -Wall
  72 -ICFLAGS        = -g -O6
  73 +#ICFLAGS       = -g -O6
  74  #ICFLAGS       = -g -O3 -Wall
  75  #ICFLAGS       = -g -O3
  76
  77 --- NuSMV-2.4.3/nusmv/src/Makefile.am~  2006-06-28 18:16:16.000000000 +0200
  78 +++ NuSMV-2.4.3/nusmv/src/Makefile.am   2007-09-14 15:48:35.000000000 +0200
  79 @@ -91,4 +91,6 @@
  80         $(mbp_libs)              \
  81         $(sa_libs)               \
  82         $(mathsat_libs)          \
  83 +       $(expat_libs)            \
  84 +       $(readline_libs)         \
  85         sm/libsm.la
  86 --- NuSMV-2.4.3/nusmv/Makefile.am~      2007-03-28 15:49:05.000000000 +0200
  87 +++ NuSMV-2.4.3/nusmv/Makefile.am       2007-09-14 15:48:37.000000000 +0200
  88 @@ -116,7 +116,7 @@
  89  libnusmv_la_LIBADD = $(top_builddir)/src/libnusmvcore.la \
  90         -L$(top_srcdir)/$(CUDD_DIR)/lib \
  91         -lcudd -lcudd_util -lmtr -lst   \
  92 -        $(readline_libs) $(zchaff_libs) $(minisat_libs) $(expat_libs)
  93 +        $(zchaff_libs) $(minisat_libs)
  94
  95  libnusmv_la_DEPENDENCIES = $(top_builddir)/src/libnusmvcore.la $(CUDD_DEPENDENCY)
  96