From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Sun, 23 May 2004 16:19:43 +0000 (+0000)
Subject: * m4/tar.m4 (_AM_PROG_TAR) <cpio>: Specify -o and -i option first,
X-Git-Tag: Release-1-8b~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbeb424c4acca8adc6b72a674b6e485bfb20abdc;p=thirdparty%2Fautomake.git

* m4/tar.m4 (_AM_PROG_TAR) <cpio>: Specify -o and -i option first,
by POSIX; and use option -d in am_untar.
---

diff --git a/ChangeLog b/ChangeLog
index b44b5ed56..5750d797f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-05-23  Alexandre Duret-Lutz  <adl@gnu.org>
 
+	* m4/tar.m4 (_AM_PROG_TAR) <cpio>: Specify -o and -i option first,
+	by POSIX; and use option -d in am_untar.
+
 	* tests/defs.in (PATH): Export it.
 
 	* lib/am/multilib.am: Add $(MAKE) comments to multido and
diff --git a/m4/tar.m4 b/m4/tar.m4
index 27020cfea..7f93e02d1 100644
--- a/m4/tar.m4
+++ b/m4/tar.m4
@@ -68,9 +68,9 @@ do
     am__untar='pax -r'
     ;;
   cpio)
-    am__tar='find "$$tardir" -print | cpio -H $1 -L -o'
-    am__tar_='find "$tardir" -print | cpio -H $1 -L -o'
-    am__untar='cpio -H $1 -i'
+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+    am__untar='cpio -i -H $1 -d'
     ;;
   none)
     am__tar=false