summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2019-12-01 17:48:04 +0100
committerZenWalker <[email protected]>2019-12-05 20:27:38 +0100
commitc541db5190d60a70d16af687a0f2071f2ea1298f (patch)
tree62136e8eb64524d781e826c7a6573d619d96f49a
parentdc5d80a7d6d3f861d6de5d3705b391a91a7209d7 (diff)
downloadengrampa-c541db5190d60a70d16af687a0f2071f2ea1298f.tar.bz2
engrampa-c541db5190d60a70d16af687a0f2071f2ea1298f.tar.xz
use cpio if no binary is found
origin commit: https://gitlab.gnome.org/GNOME/file-roller/commit/eb8a7fa
-rw-r--r--configure.ac2
-rw-r--r--src/fr-command-rpm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 680e2c0..84ab58a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -166,7 +166,7 @@ fi
AM_CONDITIONAL(ENABLE_MAGIC, test x"$enable_magic" != x"no")
AC_ARG_VAR([CPIO], [Path to the `cpio` command])
-AC_PATH_PROGS(CPIO, gcpio cpio)
+AC_PATH_PROGS(CPIO, gcpio cpio, cpio)
AC_DEFINE_UNQUOTED(CPIO_PATH, "${CPIO}", [Path to cpio])
dnl ******************************
diff --git a/src/fr-command-rpm.c b/src/fr-command-rpm.c
index c05c317..751f9a9 100644
--- a/src/fr-command-rpm.c
+++ b/src/fr-command-rpm.c
@@ -252,7 +252,7 @@ static const char *
fr_command_rpm_get_packages (FrCommand *comm,
const char *mime_type)
{
- return PACKAGES (CPIO_PATH ",rpm");
+ return PACKAGES ("cpio,rpm");
}