Adjusted packaging such that if Makefile.tests file exists, it

gets renamed to Makefile and included in the package.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index e2d18d917be7e011a1a204d208bf2b00f4585bbb..a65355e43275e35f2e7535cb11283f9d941bdd2d 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -152,6 +152,12 @@ ifneq ($(DISTRIB_PACKAGES),)
          find . -print  | grep "^./$$part/" | cut -c3- >> $(TMP)/tar.exclude; \
        done
 endif
+# if we find a Makefile.tests file, rename it to Makefile, and
+# update the tar.exclude contents so that it doesn't get excluded
+       if [ -f Makefile.tests ]; then \
+         cp -p Makefile.tests $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/Makefile; \
+         sed -i -r 's/^Makefile\$$$$//' $(TMP)/tar.exclude; \
+       fi
 # tar up distro, then gzip/bzip/zip it
        $(TAR) cf$(TARFLAGS) - -X $(TMP)/tar.exclude * .[^.]* | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); $(TAR) xf$(TARFLAGS) -)
        umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$(ZIPVER).tar.gz
@@ -253,8 +259,7 @@ else
          @svn status
 endif
 
-release-clean: clean
-       $(MAKE) -C docsrc release-clean
+release-clean: clean $(RELEASE_CLEAN_TARGETS)
        $(RM) TERMS.xml
        $(RM) $(NEWSFILE)
        $(RM) NEWS.html

diff --git a/xsl/Makefile b/xsl/Makefile
index c7102205e619bb23d46c8dd4fd5055b5b157577c..f4e1eefc37c7d20889f5d4fa17007d2db877139f 100644 (file)
--- a/xsl/Makefile
+++ b/xsl/Makefile
@@ -43,6 +43,7 @@ DISTRIB_EXCLUDES = \
   doc/HTML.manifest$$ \
   tools/xsl \
   xhtml/html2xhtml.xsl$$ \
+  Makefile.tests \
   README.BUILD \
   RELEASE-NOTES-PARTIAL.txt \
   .param.dbkns \

diff --git a/xsl/Makefile.tests b/xsl/Makefile.tests
index 56277516abb64f7227caf553ca62f60b33f8920e..4afdbf7e6a8b22bb4dfd1e4fba3b01cc99d93e46 100644 (file)
--- a/xsl/Makefile.tests
+++ b/xsl/Makefile.tests
@@ -1,4 +1,12 @@
 # $Id$
+#
+# This makefile does a "smoketest" of stylesheets for various
+# output formats in the DocBook XSL Stylesheets release package.
+# It doesn't actually check the output -- it's just useful for
+# confirming whether each XSLT transformation actually executes
+# successfully without any errors.
+#
+# To use it, run "make check" or just "make"
 
 XSLTPROC=xsltproc
 XSLTPROC_FLAGS=