Adopt tar.xz as default package archive format.

diff --git a/ChangeLog b/ChangeLog
index 289d62a..e36f980 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-07-29  Keith Marshall  <keithmarshall@users.sourceforge.net>
+
+       Adopt tar.xz as default package archive format.
+
+       * Makefile.in (TARZIP, TAREXT): New macros; define them.
+       (bindist, licdist, srcdist): Use them in place of hardcoded tar.gz
+       (maintainer-clean): Expunge tar files of any compression format.
+
 2011-07-27  Keith Marshall  <keithmarshall@users.sourceforge.net>
 
        Correct handling of release status in requirements specifications.

diff --git a/Makefile.in b/Makefile.in
index d3da357..2cb81eb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,13 +176,20 @@ PACKAGE_DISTNAME = $(PACKAGE_TARNAME)-$(PACKAGE_DISTVERSION)
 
 dist: srcdist bindist readme.txt
 
+# Specify default compression command, and associated file name extension,
+# for creation and identification of packaged tar archives.
+#
+TARZIP = xz
+TAREXT = tar.$(TARZIP)
+
 bindist: all licdist
        rm -rf staged
        $(MAKE) --no-print-directory prefix=`pwd`/staged install-strip
-       cd staged; tar chf - bin/pkginfo$(EXEEXT) | gzip -c > \
-         ../pkginfo-$(PACKAGE_DISTVERSION)-bin.tar.gz
+       cd staged; tar chf - bin/pkginfo$(EXEEXT) | $(TARZIP) -c > \
+         ../pkginfo-$(PACKAGE_DISTVERSION)-bin.$(TAREXT)
        rm staged/bin/pkginfo$(EXEEXT)
-       cd staged; tar chf - * | gzip -c > ../$(PACKAGE_DISTNAME)-bin.tar.gz
+       cd staged; tar chf - * | $(TARZIP) -c > \
+         ../$(PACKAGE_DISTNAME)-bin.$(TAREXT)
        cd staged; zip -r ../$(PACKAGE_DISTNAME)-bin.zip *
        rm -rf staged
 
@@ -194,7 +201,7 @@ licdist:
            && $(LN_S) ${abs_top_srcdir}/$$file . \
            || $(LN_S) ../$$file .; \
          done
-       tar chf - share | gzip -c > $(PACKAGE_DISTNAME)-lic.tar.gz
+       tar chf - share | $(TARZIP) -c > $(PACKAGE_DISTNAME)-lic.$(TAREXT)
        rm -rf share
 
 srcdist: pkginfo.c srcdist-doc
@@ -213,7 +220,8 @@ srcdist: pkginfo.c srcdist-doc
          done; \
        cd ${CURDIR}; done
        cd ${PACKAGE_DISTROOT}/src/pkginfo; $(LN_S) ${CURDIR}/$^ .
-       tar chf - ${PACKAGE_DISTROOT} | gzip -c > ${PACKAGE_DISTNAME}-src.tar.gz
+       tar chf - ${PACKAGE_DISTROOT} | $(TARZIP) -c > \
+         ${PACKAGE_DISTNAME}-src.$(TAREXT)
        rm -rf ${PACKAGE_DISTROOT}
 
 # README, INSTALL and NEWS files to be included in the source distribution
@@ -285,7 +293,7 @@ distclean: clean
 
 maintainer-clean: distclean
        rm -f README NEWS INSTALL readme.txt Makefile pkginfo.c
-       rm -f *-$(PACKAGE_DISTVERSION)-*.tar.gz *-$(PACKAGE_DISTVERSION)-*.zip
+       rm -f *-$(PACKAGE_DISTVERSION)-*.tar.* *-$(PACKAGE_DISTVERSION)-*.zip
        rm -rf ${PACKAGE_DISTROOT} staged ${srcdir}/autom4te.cache
 
 # $RCSfile$: end of file