- automake 1.4 was complaining about EXTRA_DATA in the doc Makefile.ams

diff --git a/aclocal.m4 b/aclocal.m4
index ece10ef55e2859370796dd61183e747b0f666bbc..87d8492d5fa5f4f3d92eb06cdd47715cd62731e4 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -67,7 +67,7 @@ dnl linking failed:
     "fail")
         LIBS="${saved_LIBS}"
         AC_MSG_RESULT([])
     "fail")
         LIBS="${saved_LIBS}"
         AC_MSG_RESULT([])

-        AC_MSG_ERROR([linking with libcln failed, maybe forgot to set \$LDFLAGS?])
+        AC_MSG_ERROR([linking with libcln failed, maybe need to set \$LDFLAGS?])

     ;;
 dnl should never ever get here:
     *)
     ;;
 dnl should never ever get here:
     *)

diff --git a/configure b/configure
index 04b641a69f0ca500de618e746b489a4793cf5733..24e578573a9a704e7d8bcb9536d4fc9f895e52fe 100755 (executable)
--- a/configure
+++ b/configure
@@ -2662,7 +2662,7 @@ fi
     "fail")
         LIBS="${saved_LIBS}"
         echo "$ac_t""" 1>&6
     "fail")
         LIBS="${saved_LIBS}"
         echo "$ac_t""" 1>&6

-        { echo "configure: error: linking with libcln failed, maybe forgot to set \$LDFLAGS?" 1>&2; exit 1; }
+        { echo "configure: error: linking with libcln failed, maybe need to set \$LDFLAGS?" 1>&2; exit 1; }

     ;;
     *)
         LIBS="${saved_LIBS}"
     ;;
     *)
         LIBS="${saved_LIBS}"

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 44b8510f3b831839dcf8edd649821d9d2225f383..23389186838c57aed01678b003659896ef9f318b 100644 (file)
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -46,7 +46,6 @@ reference.ps: latex latex/reference.ps
 ginacdocdir = $(datadir)/doc/GiNaC
 ginacreferencedir = $(ginacdocdir)/reference
 ginacreference_DATA = @REFERENCE_TARGETS@
 ginacdocdir = $(datadir)/doc/GiNaC
 ginacreferencedir = $(ginacdocdir)/reference
 ginacreference_DATA = @REFERENCE_TARGETS@

-EXTRA_DATA = index.html reference.ps

 
 CLEANFILES = *.html *.gif doxygen.css *.ps latex/*
 EXTRA_DIST = DoxyfileHTML DoxyfileTEX Doxyfooter
 
 CLEANFILES = *.html *.gif doxygen.css *.ps latex/*
 EXTRA_DIST = DoxyfileHTML DoxyfileTEX Doxyfooter

diff --git a/doc/reference/Makefile.in b/doc/reference/Makefile.in
index 3aa35437a5e8dee7d737493e4996bb2a414180fe..9240a2ef5bbb8ae7409056d5a4d50d21f2ed3daa 100644 (file)
--- a/doc/reference/Makefile.in
+++ b/doc/reference/Makefile.in
@@ -103,7 +103,6 @@ YACC = @YACC@
 ginacdocdir = $(datadir)/doc/GiNaC
 ginacreferencedir = $(ginacdocdir)/reference
 ginacreference_DATA = @REFERENCE_TARGETS@
 ginacdocdir = $(datadir)/doc/GiNaC
 ginacreferencedir = $(ginacdocdir)/reference
 ginacreference_DATA = @REFERENCE_TARGETS@

-EXTRA_DATA = index.html reference.ps

 
 CLEANFILES = *.html *.gif doxygen.css *.ps latex/*
 EXTRA_DIST = DoxyfileHTML DoxyfileTEX Doxyfooter
 
 CLEANFILES = *.html *.gif doxygen.css *.ps latex/*
 EXTRA_DIST = DoxyfileHTML DoxyfileTEX Doxyfooter

diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index 8749c7f098e679d62e1906cbd81bf48dc4ee3605..29fc24632b9b57af132250660acf884a6b774878 100644 (file)
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -74,7 +74,6 @@ tutorial.ps: tutorial.dvi
 ginacdocdir = $(datadir)/doc/GiNaC
 ginactutorialdir = $(ginacdocdir)/tutorial
 ginactutorial_DATA = @TUTORIAL_TARGETS@
 ginacdocdir = $(datadir)/doc/GiNaC
 ginactutorialdir = $(ginacdocdir)/tutorial
 ginactutorial_DATA = @TUTORIAL_TARGETS@

-EXTRA_DATA = index.html tutorial.ps

 
 CLEANFILES = *.html *.png *.ps *.tex *.log *.aux *.dvi *.eps tutorial.sgml HTML.manifest
 EXTRA_DIST = tutorial.sgml.in $(FIG)
 
 CLEANFILES = *.html *.png *.ps *.tex *.log *.aux *.dvi *.eps tutorial.sgml HTML.manifest
 EXTRA_DIST = tutorial.sgml.in $(FIG)

diff --git a/doc/tutorial/Makefile.in b/doc/tutorial/Makefile.in
index da5616c5a5468580b5ae8bf9bbf54ee1fc749419..3d2ff6a4d88d29c812e4fa952331f07fc1de102d 100644 (file)
--- a/doc/tutorial/Makefile.in
+++ b/doc/tutorial/Makefile.in
@@ -114,7 +114,6 @@ JADEARGS_HTML = -t sgml -d /usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh/html/do
 ginacdocdir = $(datadir)/doc/GiNaC
 ginactutorialdir = $(ginacdocdir)/tutorial
 ginactutorial_DATA = @TUTORIAL_TARGETS@
 ginacdocdir = $(datadir)/doc/GiNaC
 ginactutorialdir = $(ginacdocdir)/tutorial
 ginactutorial_DATA = @TUTORIAL_TARGETS@

-EXTRA_DATA = index.html tutorial.ps

 
 CLEANFILES = *.html *.png *.ps *.tex *.log *.aux *.dvi *.eps tutorial.sgml HTML.manifest
 EXTRA_DIST = tutorial.sgml.in $(FIG)
 
 CLEANFILES = *.html *.png *.ps *.tex *.log *.aux *.dvi *.eps tutorial.sgml HTML.manifest
 EXTRA_DIST = tutorial.sgml.in $(FIG)

diff --git a/ginsh/Makefile.am b/ginsh/Makefile.am
index a83c18cbfa140757b0a31f5abb51f75d29675596..3f514141fa5fc200d6d19c5b3253e5565afda275 100644 (file)
--- a/ginsh/Makefile.am
+++ b/ginsh/Makefile.am
@@ -5,7 +5,7 @@ ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)
 man_MANS = ginsh.1
 YFLAGS = -d
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)
 man_MANS = ginsh.1
 YFLAGS = -d

-EXTRA_DIST = ginsh.1 ginsh_parser.h ginsh_fcn_help.sed ginsh_op_help.sed
+EXTRA_DIST = $(man_MANS) ginsh_parser.h ginsh_fcn_help.sed ginsh_op_help.sed

 
 # files created by sed scripts
 ginsh_fcn_help.c: ginsh.1 ginsh_fcn_help.sed
 
 # files created by sed scripts
 ginsh_fcn_help.c: ginsh.1 ginsh_fcn_help.sed

diff --git a/ginsh/Makefile.in b/ginsh/Makefile.in
index dceb7d96a028076dca51ddee15027e12cfee8f85..468cd322998af27b284677c02a469b794420e2ed 100644 (file)
--- a/ginsh/Makefile.in
+++ b/ginsh/Makefile.in
@@ -102,7 +102,7 @@ ginsh_SOURCES = ginsh_parser.yy ginsh_lexer.ll ginsh.h
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)
 man_MANS = ginsh.1
 YFLAGS = -d
 ginsh_LDADD = ../ginac/libginac.la $(GINSH_LIBS)
 man_MANS = ginsh.1
 YFLAGS = -d

-EXTRA_DIST = ginsh.1 ginsh_parser.h ginsh_fcn_help.sed ginsh_op_help.sed
+EXTRA_DIST = $(man_MANS) ginsh_parser.h ginsh_fcn_help.sed ginsh_op_help.sed

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES =