From 064bbed4707c0c3bc58008dcb3171f474136dbd7 Mon Sep 17 00:00:00 2001
From: Michael Smith <xmldoc@users.sourceforge.net>
Date: Wed, 8 Mar 2006 11:57:07 +0000
Subject: [PATCH] Made adjustments to deal with relatively recent changes that
 have apparently been made in GNU tar: (1) rearranged args into an order
 acceptable to the new tar, and (2) added the "P" switch to stop it from
 complaining about about the absolute path name specified for the tar.exclude
 file.

---
 releasetools/Targets.mk   | 16 ++++++++--------
 releasetools/Variables.mk |  2 ++
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 890775ae1..72df0a60e 100644
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -121,9 +121,9 @@ ifneq ($(DISTRIB_PACKAGES),)
 	done
 endif
 # tar up distro, then gzip/bzip/zip it
-	tar cf - * .[^.]* --exclude-from $(TMP)/tar.exclude | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); tar xf -)
-	umask 022; cd $(TMP) && tar cf - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$(ZIPVER).tar.gz
-	umask 022; cd $(TMP) && tar cf - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$(ZIPVER).tar.bz2
+	$(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
+	umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$(ZIPVER).tar.bz2
 	umask 022; cd $(TMP) && zip -q -rpD docbook-$(DISTRO)-$(ZIPVER).zip docbook-$(DISTRO)-$(ZIPVER)
 	rm -f $(TMP)/tar.exclude
 
@@ -147,13 +147,13 @@ ifneq ($(DISTRIB_PACKAGES),)
 	for file in $(ZIP_EXCLUDES); do \
 	  find . -print  | grep $$file   | cut -c3- >> $(TMP)/tar.exclude; \
 	done; \
-	tar cf - --ignore-failed-read $$part $${part}src images --exclude-from $(TMP)/tar.exclude | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); tar xf -); \
+	$(TAR) cf$(TARFLAGS) - -X $(TMP)/tar.exclude --ignore-failed-read $$part $${part}src images | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); $(TAR) xf$(TARFLAGS) -); \
 	umask 022; (cd $(TMP) && \
 	if [ -d docbook-$(DISTRO)-$(ZIPVER)/images ]; \
 	  then mv docbook-$(DISTRO)-$(ZIPVER)/images docbook-$(DISTRO)-$(ZIPVER)/doc/; \
 	fi) ; \
-	umask 022; (cd $(TMP) && tar cf - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.gz); \
-	umask 022; (cd $(TMP) && tar cf - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.bz2); \
+	umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.gz); \
+	umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.bz2); \
 	umask 022; (cd $(TMP) && zip -q -rpD docbook-$(DISTRO)-$$part-$(ZIPVER).zip docbook-$(DISTRO)-$(ZIPVER)); \
 	rm -f $(TMP)/tar.exclude; \
 	done
@@ -170,8 +170,8 @@ install: zip
 	   umask 002; \
 	   cd $(RELEASE_DIR)/$(DISTRO); \
 	   rm -rf $(ZIPVER); \
-	   tar xfj docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
-	   tar xfj docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
+	   $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
+	   $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
 	   mv docbook-$(DISTRO)-$(ZIPVER) $(ZIPVER); \
 	   rm -rf docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
 	   rm -rf docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index ffde3ae8b..7ca1dfa33 100644
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -121,3 +121,5 @@ SF_UPLOAD_DIR=incoming
 PROJECT_HOST=docbook.sf.net
 RELEASE_DIR=/home/groups/d/do/docbook/htdocs/release
 PROJECT_USER:=`sed 's/^:.\+:\([^@]\+\)@.\+$$/\1/' CVS/Root`
+TAR=tar
+TARFLAGS=P
-- 
2.40.0