Re: Any issues that would hold up release of 4.6.1?

[Mojca M. <moj...@gm...>]

On Sun, Sep 23, 2012 at 4:35 AM, sfeam (Ethan Merritt) wrote:
>
>> Making install in docs
>> ../../original/mkinstalldirs
>> /Users/m/gnuplot/build-original/inst/share/gnuplot/4.6
>> /opt/local/bin/ginstall -c -m 644 gnuplot.gih
>> /Users/m/gnuplot/build-original/inst/share/gnuplot/4.6/gnuplot.gih
>> make[1]: *** No rule to make target
>> `../../original/docs/gnuplot.texi', needed by `gnuplot.info'.  Stop.
>> make: *** [install-recursive] Error 1
>
> Ah, but here I think you are seeing a difference of building from
> CVS vs. building from the distribution tarball.  The distribution
> tarball explicitly contains an up-to-date copy of gnuplot.texi, so
> it doesn't need to be rebuilt and this make rule is not needed.
>
> Try doing "make gnuplot.texi" manually before your subsequent testing,
> which should reproduce the state saved in the tarball.

It doesn't help. I can only run "make gnuplot.texi" in build tree (I
cannot run it in source tree when doing an out of source build). The
file *is* generated, already now. The problem is that Makefile
declares dependency on gnuplot.texi being present in $(srcdir) and
there is no way that the file can end up there unless it comes as
precompiled in distribution.

What about trying to copy the file explicitly if already present (in
the same way as 'gnuplot.doc')?

@@ -389,18 +389,20 @@ wxhelp/doc2html: wxhelp/doc2html.o termdoc.o
xref.o ../src/version.o
 ### GNU info format
 info: gnuplot.info

-gnuplot.info: $(srcdir)/gnuplot.texi
-	$(MAKEINFO) -I$(srcdir) $(srcdir)/gnuplot.texi --no-split --output=$@
+gnuplot.info: gnuplot.texi
+	$(MAKEINFO) -I$(srcdir) gnuplot.texi --no-split --output=$@

 # Thanks to Bruce Ravel for doc2texi.el!
 gnuplot.texi $(srcdir)/gnuplot-eldoc.el $(srcdir)/gnuplot-eldoc.elc:
$(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
 	@echo "Creating texinfo and eldoc strings file"
 	@if test "$(EMACS)" != no; then \
-	   @test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING GNUPLOT.DOC" ; \
-	   @test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc . ; \
+	   test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING GNUPLOT.DOC" ; \
+	   test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc . ; \
 	   $(EMACS) -batch -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
 	   echo "Compiling gnuplot-eldoc.el" ; \
 	   $(EMACS) -batch --eval='(byte-compile-file "gnuplot-eldoc.el")' ; \
+	elif [ "$(top_srcdir)" != "$(top_builddir)" ] && [ -f
$(srcdir)/gnuplot.texi ]; then \
+		cp $(srcdir)/gnuplot.texi . ; \
 	else \
 	   echo "No emacs found - cannot create texinfo file" ; \
 	fi

I didn't test this patch extensively yet - I would first like to know
if the idea would be acceptable.

Mojca