* Makefile.am: Rename dist2 to tarball target. Fix the version

	number to have the minor release too.

diff --git a/Makefile.am b/Makefile.am
index 8471e14..8799b88 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,7 @@ libexec_SCRIPTS = config.guess
 
 TLCSH = @TCLSH@
 
-RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST)
+RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST)
 RUNTEST = ` \
   if [ -f ${srcdir}/runtest$(EXEEXT) ] ; then \
     echo ${srcdir}/runtest$(EXEEXT) ; \
@@ -29,38 +29,40 @@ check-DEJAGNU:
        @echo "Do nothing here, cause we don't want to run the tests twice"
 
 # Set ourselves up to build a RedHat package
-#dist2: tarball rpmspec overview.html overview.ps overview.pdf \
-#       dejagnu-${VERSION}.tar.gz
-#      -rm -fr dejagnu-${VERSION}
-#      cp -fpr $(srcdir) dejagnu-${VERSION}
-#      @echo "clean up stuff we don't want in the source file"
-#      (cd dejagnu-${VERSION} ; $(srcdir)/Clean.tcl)
-#      -mkdir -p doc/overview
-#      -cp -fr doc/overview dejagnu-${VERSION}/doc/
-#      -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/
-#      -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/
-#      tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}.0
-#      gzip -9fv ../dejagnu-${VERSION}.tar
-#      cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/
-#      cp -f $(srcdir)/redhat/dejagnu.spec /usr/src/redhat/SPECS/
-
-#tarball: overview.html overview.ps overview.pdf
-#      -rm -fr dejagnu-${VERSION}
-#      cp -fpr $(srcdir) dejagnu-${VERSION}
-#      @echo "clean up stuff we don't want in the source file"
-#      (cd dejagnu-${VERSION} ; $(srcdir)/Clean.tcl)
-#      -mkdir -p doc/overview
-#      -cp -fr doc/overview dejagnu-${VERSION}/doc/
-#      -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/
-#      -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/
-#      tar cf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}.0
-#      gzip -9fv ../dejagnu-${VERSION}.tar
+tarball: doc/overview/overview.html doc/overview.pdf doc/overview.ps
+       -rm -fr dejagnu-${VERSION}
+       cp -fpr $(srcdir) dejagnu-${VERSION}
+       @echo "clean up stuff we don't want in the source file"
+       src=$(srcdir); \
+       dir=`(cd $${src}; pwd)`; \
+       (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); \
+       -mkdir -p doc/overview; \
+       -cp -fr doc/overview dejagnu-${VERSION}/doc/; \
+       -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; \
+       -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; \
+       tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \
+       gzip -9fv ../dejagnu-${VERSION}.tar; \
+       cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/; \
+       cp -f $${dir}/redhat/dejagnu.spec /usr/src/redhat/SPECS/
+
+DATE = `date "+%Y%m%d`
+snapshot:
+       -rm -fr dejagnu-${DATE}
+       cp -fpr $(srcdir) dejagnu-${DATE}
+       @echo "clean up stuff we don't want in the source file"
+       (cd dejagnu-${DATE} ; $(srcdir)/Clean.tcl)
+       -mkdir -p doc/overview
+       -cp -fr doc/overview dejagnu-${DATE}/doc/
+       -cp -fr doc/overview.ps dejagnu-${DATE}/doc/
+       -cp -fr doc/overview.pdf dejagnu-${DATE}/doc/
+       tar cf ../dejagnu-${DATE}.tar dejagnu-${DATE}
+       gzip -9fv ../dejagnu-${DATE}.tar
 
 rpmspec: $(srcdir)/redhat/dejagnu.spec
        cp -f $(srcdir)/redhat/dejagnu.spec /usr/src/redhat/SPECS/
 
-rpm: dist2 rpmspec
-       cp -f $(distdir).tar.gz /usr/src/redhat/SOURCES/
+rpm: tarball rpmspec
+       cp -f ../$(distdir).tar.gz /usr/src/redhat/SOURCES/
        rpm -ba /usr/src/redhat/SPECS/dejagnu.spec
 
 overview.html install-doc doc html dvi ps pdf rtf:
@@ -125,7 +127,18 @@ uninstall-local:
        done
        rm -f $(baseboards_dest)/`basename dejagnu.h`;
 
-
+site.exp: Makefile
+       @echo 'Making a new site.exp file...'
+       @test ! -f site.bak || rm -f site.bak
+       @echo '## these variables are automatically generated by make ##' > $@-t
+       @echo '# Do not edit here.  If you wish to override these values' >> $-t
+       @echo '# edit the last section' >> $@-t
+       @echo 'set srcdir $(srcdir)' >> $@-t
+       @echo 'set objdir' `pwd` >> $@-t
+       @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
+       @test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
+       @test ! -f site.exp || mv site.exp site.bak
+       @mv $@-t site.exp
 
 
 

diff --git a/Makefile.in b/Makefile.in
index 1bf099e..efadbf9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,6 +59,7 @@ POST_UNINSTALL = :
 BOARDS = @BOARDS@
 CC = @CC@
 CONFIG = @CONFIG@
+CXX = @CXX@
 DOCBOOK = @DOCBOOK@
 EXEEXT = @EXEEXT@
 MAINT = @MAINT@
@@ -86,14 +87,13 @@ libexec_SCRIPTS = config.guess
 
 TLCSH = @TCLSH@
 
-RUNTESTDEFAULTFLAGS = --tool runtest --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST)
+RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST)
 RUNTEST = `   if [ -f ${srcdir}/runtest$(EXEEXT) ] ; then     echo ${srcdir}/runtest$(EXEEXT) ;   else echo "ERROR: runtest not found" ; exit 1; fi`
 
 
 CLEANFILES = x.log x.sum site.bak setval.tmp
 
-SUBVERSION = 0
-FULLVERSION = $(VERSION).$(SUBVERSION)
+DATE = `date "+%Y%m%d`
 
 # Below, host-independent data files that need to get installed.
 # We do it this way so we can use globbing.
@@ -118,7 +118,7 @@ configure configure.in install-sh missing mkinstalldirs
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 EXPECT = expect
 all: all-redirect
@@ -330,7 +330,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          d=$(srcdir); \
          if test -d $$d/$$file; then \
-           cp -pr $$/$$file $(distdir)/$$file; \
+           cp -pr $$d/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -352,19 +352,6 @@ distdir: $(DISTFILES)
 RUNTESTFLAGS =
 
 DEJATOOL = $(PACKAGE)
-site.exp: Makefile
-       @echo 'Making a new site.exp file...'
-       @test ! -f site.bak || rm -f site.bak
-       @echo '## these variables are automatically generated by make ##' > $@-t
-       @echo '# Do not edit here.  If you wish to override these values' >> $@-t
-       @echo '# edit the last section' >> $@-t
-       @echo 'set tool $(DEJATOOL)' >> $@-t
-       @echo 'set srcdir $(srcdir)' >> $@-t
-       @echo 'set objdir' `pwd` >> $@-t
-       @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
-       @test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
-       @test ! -f site.exp || mv site.exp site.bak
-       @mv $@-t site.exp
 info-am:
 info: info-recursive
 dvi-am:
@@ -444,39 +431,40 @@ mostlyclean distclean maintainer-clean
 
 check-DEJAGNU:
        @echo "Do nothing here, cause we don't want to run the tests twice"
-# Set ourselves up to build a RedHat package
-dist2: tarball rpmspec overview.html overview.ps overview.pdf \
-       dejagnu-${FULLVERSION}.tar.gz
-#      -rm -fr dejagnu-${FULLVERSION}
-#      cp -fpr $(srcdir) dejagnu-${FULLVERSION}
-#      @echo "clean up stuff we don't want in the source file"
-#      (cd dejagnu-${FULLVERSION} ; $(srcdir)/Clean.tcl)
-#      -mkdir -p doc/overview
-#      -cp -fr doc/overview dejagnu-${FULLVERSION}/doc/
-#      -cp -fr doc/overview.ps dejagnu-${FULLVERSION}/doc/
-#      -cp -fr doc/overview.pdf dejagnu-${FULLVERSION}/doc/
-#      tar cvf ../dejagnu-${FULLVERSION}.tar dejagnu-${VERSION}.0
-#      gzip -9fv ../dejagnu-${FULLVERSION}.tar
-       cp -f ../dejagnu-${FULLVERSION}.tar.gz /usr/src/redhat/SOURCES/
-       cp -f $(srcdir)/redhat/dejagnu.spec /usr/src/redhat/SPECS/
 
-tarball:
-       -rm -fr dejagnu-${FULLVERSION}
-       cp -fpr $(srcdir) dejagnu-${FULLVERSION}
+# Set ourselves up to build a RedHat package
+tarball: doc/overview/overview.html doc/overview.pdf doc/overview.ps
+       -rm -fr dejagnu-${VERSION}
+       cp -fpr $(srcdir) dejagnu-${VERSION}
        @echo "clean up stuff we don't want in the source file"
-       (cd dejagnu-${FULLVERSION} ; $(srcdir)/Clean.tcl)
+       src=$(srcdir); \
+       dir=`(cd $${src}; pwd)`; \
+       (cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); \
+       -mkdir -p doc/overview; \
+       -cp -fr doc/overview dejagnu-${VERSION}/doc/; \
+       -cp -fr doc/overview.ps dejagnu-${VERSION}/doc/; \
+       -cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/; \
+       tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \
+       gzip -9fv ../dejagnu-${VERSION}.tar; \
+       cp -f ../dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/; \
+       cp -f $${dir}/redhat/dejagnu.spec /usr/src/redhat/SPECS/
+snapshot:
+       -rm -fr dejagnu-${DATE}
+       cp -fpr $(srcdir) dejagnu-${DATE}
+       @echo "clean up stuff we don't want in the source file"
+       (cd dejagnu-${DATE} ; $(srcdir)/Clean.tcl)
        -mkdir -p doc/overview
-       -cp -fr doc/overview dejagnu-${FULLVERSION}/doc/
-       -cp -fr doc/overview.ps dejagnu-${FULLVERSION}/doc/
-       -cp -fr doc/overview.pdf dejagnu-${FULLVERSION}/doc/
-       tar cf ../dejagnu-${FULLVERSION}.tar dejagnu-${VERSION}.0
-       gzip -9fv ../dejagnu-${FULLVERSION}.tar
+       -cp -fr doc/overview dejagnu-${DATE}/doc/
+       -cp -fr doc/overview.ps dejagnu-${DATE}/doc/
+       -cp -fr doc/overview.pdf dejagnu-${DATE}/doc/
+       tar cf ../dejagnu-${DATE}.tar dejagnu-${DATE}
+       gzip -9fv ../dejagnu-${DATE}.tar
 
 rpmspec: $(srcdir)/redhat/dejagnu.spec
        cp -f $(srcdir)/redhat/dejagnu.spec /usr/src/redhat/SPECS/
 
-rpm: dist2 rpmspec
-       cp -f $(distdir).tar.gz /usr/src/redhat/SOURCES/
+rpm: tarball rpmspec
+       cp -f ../$(distdir).tar.gz /usr/src/redhat/SOURCES/
        rpm -ba /usr/src/redhat/SPECS/dejagnu.spec
 
 overview.html install-doc doc html dvi ps pdf rtf:
@@ -491,6 +479,8 @@ dist-hook: rpmspec overview.html
        cp -fpr $(srcdir) $(distdir)
        (cd $(distdir) ; $(TCLSH) $(srcdir)/Clean.tcl)
        -cp -fr doc/overview $(distdir)/doc/
+       -cp -fr doc/overview.ps $(distdir)/doc/
+       -cp -fr doc/overview.pdf $(distdir)/doc/
 
 install-data-local:
        $(mkinstalldirs) $(lib_dest)
@@ -526,6 +516,19 @@ uninstall-local:
        done
        rm -f $(baseboards_dest)/`basename dejagnu.h`;
 
+site.exp: Makefile
+       @echo 'Making a new site.exp file...'
+       @test ! -f site.bak || rm -f site.bak
+       @echo '## these variables are automatically generated by make ##' > $@-t
+       @echo '# Do not edit here.  If you wish to override these values' >> $-t
+       @echo '# edit the last section' >> $@-t
+       @echo 'set srcdir $(srcdir)' >> $@-t
+       @echo 'set objdir' `pwd` >> $@-t
+       @echo '## All variables above are generated by configure. Do Not Edit ##' >> $@-t
+       @test ! -f site.exp || sed '1,/^## All variables above are.*##/ d' site.exp >> $@-t
+       @test ! -f site.exp || mv site.exp site.bak
+       @mv $@-t site.exp
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: