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

	number to have the minor release too.

1 files changed, 43 insertions, 30 deletions

diff --git a/Makefile.am b/Makefile.am
index 8471e14..8799b88 100644
--- 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