summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Duret-Lutz <adl@gnu.org>2004-05-23 16:19:43 +0000
committerAlexandre Duret-Lutz <adl@gnu.org>2004-05-23 16:19:43 +0000
commitfbeb424c4acca8adc6b72a674b6e485bfb20abdc (patch)
tree6524101f42ee8d98daa4a9fab7a177c57f1874cc
parente41aadc0d3242d79527ca6136eef1e42e3c9aee5 (diff)
downloadautomake-fbeb424c4acca8adc6b72a674b6e485bfb20abdc.tar.gz
automake-fbeb424c4acca8adc6b72a674b6e485bfb20abdc.tar.bz2
automake-fbeb424c4acca8adc6b72a674b6e485bfb20abdc.zip
* m4/tar.m4 (_AM_PROG_TAR) <cpio>: Specify -o and -i option first,
by POSIX; and use option -d in am_untar.
-rw-r--r--ChangeLog3
-rw-r--r--m4/tar.m46
2 files changed, 6 insertions, 3 deletions
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