From e89dd0113650c84737e2bfab8cff9595a9ebc990 Mon Sep 17 00:00:00 2001 From: Tim Mann Date: Fri, 28 Nov 2003 22:23:12 +0000 Subject: [PATCH] Final changes for 4.2.7. Corrected the previous fix for texi2man bug and fixed some problems with "make dist". --- Makefile.in | 39 +++++++++++++++++---------------------- configure | 2 +- texi2man | 3 ++- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/Makefile.in b/Makefile.in index c419f97..cc5eb21 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,33 +40,29 @@ LIBS = @X_LIBS@ @XAW_LIBS@ @PRE_XMULIB@ -lXmu @POST_XMULIB@ -lXt -lXext \ NROFF = @NROFF@ NROFFFLAGS = @NROFFFLAGS@ -DISTSOURCE = acconfig.h AUTHORS backend.c backend.h backendz.h bitmaps \ - ChangeLog ChangeLog.2 childio.c childio.h cmail.in \ - common.h config.guess config.h.in config.sub configure configure.in \ - COPYING COPYRIGHT engine-intf.html FAQ.html frontend.h gamelist.c \ - gpl.texinfo ics-parsing.txt INSTALL install-sh lists.c lists.h \ - Makefile.in mkinstalldirs moves.c moves.h NEWS parser.h parser.l \ - pgntags.c pixmaps pxboard READ_ME shiphtml sounds ToDo winboard \ - xboard.c xboard.h xboard.texi xboard.texinfo.in \ - xedittags.c xedittags.h xgamelist.c xgamelist.h xhistory.c \ - xhistory.h zic2xpm.c zic2xpm.man zippy.c zippy.h zippy.lines \ - zippy.README - -PSEUDOSOURCE = parser.c xboard.man xboard.info FAQ +DISTSOURCE = acconfig.h AUTHORS backend.c backend.h backendz.h bitmaps \ + ChangeLog ChangeLog.2 childio.c childio.h cmail.in common.h \ + config.guess config.h.in config.sub configure configure.in COPYING \ + COPYRIGHT copyright.texi engine-intf.html FAQ.html frontend.h \ + gamelist.c gpl.texinfo ics-parsing.txt INSTALL install-sh lists.c \ + lists.h Makefile.in mkinstalldirs moves.c moves.h NEWS parser.h \ + parser.l pgntags.c pixmaps pxboard READ_ME shiphtml sounds texi2man \ + ToDo winboard xboard.c xboard.h xboard.texi xboard.texinfo.in \ + xedittags.c xedittags.h xgamelist.c xgamelist.h xhistory.c xhistory.h \ + zic2xpm.c zic2xpm.man zippy.c zippy.h zippy.lines zippy.README + +PSEUDOSOURCE = parser.c xboard.man xboard.info xboard.txt zic2xpm.txt FAQ DISTDIR = @PRODUCT@-@VERSION@.@PATCHLEVEL@ XBOARDOBJ = parser.o xboard.o backend.o moves.o childio.o gamelist.o \ lists.o pgntags.o xgamelist.o xedittags.o xhistory.o @ZIPPY_O@ -### Targets required by GNU standards ####################################### - -default: xboard zic2xpm xboard.txt zic2xpm.txt +default: xboard zic2xpm all: default pseudosource info FAQ html dvi ps -install: installdirs xboard zic2xpm cmail pxboard xboard.man \ - zic2xpm.man +install: installdirs default $(INSTALL_PROGRAM) -s xboard $(bindir)/xboard $(INSTALL_PROGRAM) -s zic2xpm $(bindir)/zic2xpm $(INSTALL_PROGRAM) cmail $(bindir)/cmail @@ -137,19 +133,18 @@ FAQ: FAQ.html pseudosource: $(PSEUDOSOURCE) dist: distclean - ((cd linux && make pseudosource && cp $(PSEUDOSOURCE) -a ..) || true) if [ -f winboard/WINBOARD.HLP ] ; then mv winboard/WINBOARD.HLP winboard/winboard.hlp ; fi rm -rf $(DISTDIR) mkdir $(DISTDIR) cp -a $(DISTSOURCE) $(DISTDIR)/ - cp -a $(PSEUDOSOURCE) $(DISTDIR)/ + (cd linux && make pseudosource && \ + cp $(PSEUDOSOURCE) -a ../$(DISTDIR)/) || \ + cp -a $(PSEUDOSOURCE) $(DISTDIR)/ tar cvf - $(DISTDIR) | gzip > $(DISTDIR).tar.gz rm -rf $(DISTDIR) check: all -### End targets required by GNU standards ################################### - .SUFFIXES: .SUFFIXES: .c .o .man .txt diff --git a/configure b/configure index 313a631..cf0fa51 100755 --- a/configure +++ b/configure @@ -1282,7 +1282,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu PRODUCT=xboard VERSION=4.2 -PATCHLEVEL=pre7 +PATCHLEVEL=7 if test -z "$CFLAGS" ; then CFLAGS=" " diff --git a/texi2man b/texi2man index b6bf052..b8fd364 100755 --- a/texi2man +++ b/texi2man @@ -169,7 +169,8 @@ sub parse } if (/\@include (.*)/) { - open(my $INCL, $1) or open($INCL, "../$1") or die "$1: $!"; + my $INCL; + open($INCL, $1) or open($INCL, "../$1") or die "$1: $!"; while (<$INCL>) { parse(); } -- 1.7.0.4