* Makefile.am (PKGING): Remove.post-automake-overhaul

	(PACKAGING_METAFILES): Update accordingly.
	(CLEANFILES, check-DEJAGNU): Remove.
	(tarball): Remove; use `dist'.
	(deb): Update target recipe to use `make dist'.

3 files changed, 54 insertions, 89 deletions

diff --git a/ChangeLog b/ChangeLog
index 0fffd83..b2593ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2004-02-07  Ben Elliston  <bje@wasabisystems.com>
 
+	* Makefile.am (PKGING): Remove.
+	(PACKAGING_METAFILES): Update accordingly.
+	(CLEANFILES, check-DEJAGNU): Remove.
+	(tarball): Remove; use `dist'.
+	(deb): Update target recipe to use `make dist'.
+
+2004-02-07  Ben Elliston  <bje@wasabisystems.com>
+
 	* Clean.tcl: Remove.
 
 	* Makefile.am (SUBDIRS): Add testsuite, example directories.
diff --git a/Makefile.am b/Makefile.am
index 9e78203..9a7790b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -169,12 +169,11 @@ pkgdata_DATA = stub-loader.c testglue.c
 djlibexecdir = $(pkgdatadir)/libexec
 djlibexec_SCRIPTS = config.guess
 
-PKGING = packaging
-PACKAGING_METAFILES = $(PKGING)/depot/dejagnu.psf \
-	$(PKGING)/deb/site.exp $(PKGING)/deb/changelog $(PKGING)/deb/conffiles \
-	$(PKGING)/deb/control $(PKGING)/deb/copyright $(PKGING)/deb/postinst \
-	$(PKGING)/deb/preinst $(PKGING)/deb/rules $(PKGING)/pkg/pkginfo \
-	$(PKGING)/pkg/prototype $(PKGING)/rpm/dejagnu.spec
+PACKAGING_METAFILES = packaging/depot/dejagnu.psf \
+	packaging/deb/site.exp packaging/deb/changelog packaging/deb/conffiles \
+	packaging/deb/control packaging/deb/copyright packaging/deb/postinst \
+	packaging/deb/preinst packaging/deb/rules packaging/pkg/pkginfo \
+	packaging/pkg/prototype packaging/rpm/dejagnu.spec
 
 RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST)
 RUNTEST = ` \
@@ -182,24 +181,6 @@ RUNTEST = ` \
     echo ${srcdir}/runtest$(EXEEXT); \
   else echo "ERROR: runtest not found" ; exit 1; fi`
 
-CLEANFILES = x.log x.sum site.bak setval.tmp
-check-DEJAGNU:
-	cd testsuite ; $(MAKE) check
-	cd example ; $(MAKE) check
-
-# Set ourselves up to build an RPM
-tarball: book1.html overview.ps overview.pdf
-	-rm -fr dejagnu-${VERSION}
-	cp -fpPR $(srcdir) dejagnu-${VERSION}
-	src=$(srcdir); \
-	dir=`(cd $${src}; pwd)`; \
-	(cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); \
-	  cp -R $(srcdir)/doc/html dejagnu-${VERSION}/doc/; \
-	  cp $(srcdir)/doc/overview.ps dejagnu-${VERSION}/doc/; \
-	  cp $(srcdir)/doc/overview.pdf dejagnu-${VERSION}/doc/; \
-	  tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \
-	  gzip -9fv ../dejagnu-${VERSION}.tar
-
 rpmspec: $(srcdir)/packaging/rpm/dejagnu.spec
 	cp -f $(srcdir)/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/
 
@@ -208,19 +189,11 @@ rpm: rpmspec dist
 	cp -f dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/
 	rpm -ba /usr/src/redhat/SPECS/dejagnu.spec
 
-# Build a Debian package
+# Build a Debian GNU/Linux package
 deb: dist
 	-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/html;
-	-cp -fr $(srcdir)/packaging/deb dejagnu-${VERSION}/
-	-cp -fr doc/html dejagnu-${VERSION}/doc/;
-	-cp -fr doc/overview.ps dejagnu-${VERSION}/doc/;
-	-cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/;
+	tar xfz dejagnu-${VERSION}.tar.gz
+	cp -fr $(srcdir)/packaging/deb dejagnu-${VERSION}/
 	(cd dejagnu-${VERSION}; dpkg-buildpackage)
 
 PKGDIR = /opt
@@ -246,15 +219,15 @@ solpkg: $(srcdir)/packaging/pkg/prototype
 # Build a HP depot package
 hpdepot:
 	if test ! -d $(PKGDIR)/dejagnu; then \
-	rm -fr dejagnu-${VERSION}; \
-	mkdir dejagnu-${VERSION}; \
-	cd dejagnu-${VERSION}; \
-	$(srcdir)/configure -v --prefix $(PKGDIR)/dejagnu; \
-	make install ; \
+	  rm -fr dejagnu-${VERSION}; \
+	  mkdir dejagnu-${VERSION}; \
+	  cd dejagnu-${VERSION}; \
+	  $(srcdir)/configure -v --prefix $(PKGDIR)/dejagnu; \
+	  make install ; \
 	fi
 	swpackage -s $(srcdir)/packaging/depot/dejagnu.psf -x target_type=directory -d /tmp
 	here=`pwd`; \
-	cd /tmp; \
-	tar cf $$here/dejagnu-${VERSION}.hpux11.depot dejagnu; \
-	gzip -9fv  $$here/dejagnu-${VERSION}.hpux11.depot; \
-	rm -fr /tmp/dejagnu
+	  cd /tmp; \
+	  tar cf $$here/dejagnu-${VERSION}.hpux11.depot dejagnu; \
+	  gzip -9fv  $$here/dejagnu-${VERSION}.hpux11.depot; \
+	  rm -fr /tmp/dejagnu
diff --git a/Makefile.in b/Makefile.in
index 8e0920b..63efa86 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -339,12 +339,11 @@ baseboard_SCRIPTS = \
 pkgdata_DATA = stub-loader.c testglue.c
 djlibexecdir = $(pkgdatadir)/libexec
 djlibexec_SCRIPTS = config.guess
-PKGING = packaging
-PACKAGING_METAFILES = $(PKGING)/depot/dejagnu.psf \
-	$(PKGING)/deb/site.exp $(PKGING)/deb/changelog $(PKGING)/deb/conffiles \
-	$(PKGING)/deb/control $(PKGING)/deb/copyright $(PKGING)/deb/postinst \
-	$(PKGING)/deb/preinst $(PKGING)/deb/rules $(PKGING)/pkg/pkginfo \
-	$(PKGING)/pkg/prototype $(PKGING)/rpm/dejagnu.spec
+PACKAGING_METAFILES = packaging/depot/dejagnu.psf \
+	packaging/deb/site.exp packaging/deb/changelog packaging/deb/conffiles \
+	packaging/deb/control packaging/deb/copyright packaging/deb/postinst \
+	packaging/deb/preinst packaging/deb/rules packaging/pkg/pkginfo \
+	packaging/pkg/prototype packaging/rpm/dejagnu.spec
 
 RUNTESTDEFAULTFLAGS = --srcdir $(srcdir)/testsuite RUNTEST=$(RUNTEST)
 RUNTEST = ` \
@@ -352,7 +351,6 @@ RUNTEST = ` \
     echo ${srcdir}/runtest$(EXEEXT); \
   else echo "ERROR: runtest not found" ; exit 1; fi`
 
-CLEANFILES = x.log x.sum site.bak setval.tmp
 PKGDIR = /opt
 all: all-recursive
 
@@ -670,6 +668,17 @@ GTAGS:
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+check-DEJAGNU: site.exp
+	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
+	EXPECT=$(EXPECT); export EXPECT; \
+	runtest=$(RUNTEST); \
+	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+	  l='$(DEJATOOL)'; for tool in $$l; do \
+	    $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
+	  done; \
+	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
+	fi
 site.exp: Makefile
 	@echo 'Making a new site.exp file...'
 	@echo '## these variables are automatically generated by make ##' >site.tmp
@@ -693,7 +702,7 @@ distclean-DEJAGNU:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/$(PKGING)/deb $(distdir)/$(PKGING)/depot $(distdir)/$(PKGING)/pkg $(distdir)/$(PKGING)/rpm $(distdir)/baseboards $(distdir)/config $(distdir)/lib
+	$(mkdir_p) $(distdir)/baseboards $(distdir)/config $(distdir)/lib $(distdir)/packaging/deb $(distdir)/packaging/depot $(distdir)/packaging/pkg $(distdir)/packaging/rpm
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -854,7 +863,6 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-rm -f $(CONFIG_CLEAN_FILES)
@@ -944,22 +952,6 @@ uninstall-info: uninstall-info-recursive
 	uninstall-includeHEADERS uninstall-info-am \
 	uninstall-pkgdataDATA uninstall-pkgdataSCRIPTS
 
-check-DEJAGNU:
-	cd testsuite ; $(MAKE) check
-	cd example ; $(MAKE) check
-
-# Set ourselves up to build an RPM
-tarball: book1.html overview.ps overview.pdf
-	-rm -fr dejagnu-${VERSION}
-	cp -fpPR $(srcdir) dejagnu-${VERSION}
-	src=$(srcdir); \
-	dir=`(cd $${src}; pwd)`; \
-	(cd dejagnu-${VERSION} ; $${dir}/Clean.tcl); \
-	  cp -R $(srcdir)/doc/html dejagnu-${VERSION}/doc/; \
-	  cp $(srcdir)/doc/overview.ps dejagnu-${VERSION}/doc/; \
-	  cp $(srcdir)/doc/overview.pdf dejagnu-${VERSION}/doc/; \
-	  tar cvf ../dejagnu-${VERSION}.tar dejagnu-${VERSION}; \
-	  gzip -9fv ../dejagnu-${VERSION}.tar
 
 rpmspec: $(srcdir)/packaging/rpm/dejagnu.spec
 	cp -f $(srcdir)/packaging/rpm/dejagnu.spec /usr/src/redhat/SPECS/
@@ -969,19 +961,11 @@ rpm: rpmspec dist
 	cp -f dejagnu-${VERSION}.tar.gz /usr/src/redhat/SOURCES/
 	rpm -ba /usr/src/redhat/SPECS/dejagnu.spec
 
-# Build a Debian package
+# Build a Debian GNU/Linux package
 deb: dist
 	-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/html;
-	-cp -fr $(srcdir)/packaging/deb dejagnu-${VERSION}/
-	-cp -fr doc/html dejagnu-${VERSION}/doc/;
-	-cp -fr doc/overview.ps dejagnu-${VERSION}/doc/;
-	-cp -fr doc/overview.pdf dejagnu-${VERSION}/doc/;
+	tar xfz dejagnu-${VERSION}.tar.gz
+	cp -fr $(srcdir)/packaging/deb dejagnu-${VERSION}/
 	(cd dejagnu-${VERSION}; dpkg-buildpackage)
 
 # Build a Solaris package
@@ -1005,18 +989,18 @@ solpkg: $(srcdir)/packaging/pkg/prototype
 # Build a HP depot package
 hpdepot:
 	if test ! -d $(PKGDIR)/dejagnu; then \
-	rm -fr dejagnu-${VERSION}; \
-	mkdir dejagnu-${VERSION}; \
-	cd dejagnu-${VERSION}; \
-	$(srcdir)/configure -v --prefix $(PKGDIR)/dejagnu; \
-	make install ; \
+	  rm -fr dejagnu-${VERSION}; \
+	  mkdir dejagnu-${VERSION}; \
+	  cd dejagnu-${VERSION}; \
+	  $(srcdir)/configure -v --prefix $(PKGDIR)/dejagnu; \
+	  make install ; \
 	fi
 	swpackage -s $(srcdir)/packaging/depot/dejagnu.psf -x target_type=directory -d /tmp
 	here=`pwd`; \
-	cd /tmp; \
-	tar cf $$here/dejagnu-${VERSION}.hpux11.depot dejagnu; \
-	gzip -9fv  $$here/dejagnu-${VERSION}.hpux11.depot; \
-	rm -fr /tmp/dejagnu
+	  cd /tmp; \
+	  tar cf $$here/dejagnu-${VERSION}.hpux11.depot dejagnu; \
+	  gzip -9fv  $$here/dejagnu-${VERSION}.hpux11.depot; \
+	  rm -fr /tmp/dejagnu
 # 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: