summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraveit65 <[email protected]>2019-12-01 17:48:04 +0100
committerraveit65 <[email protected]>2020-01-04 13:34:37 +0100
commit7c0392372800f570d7706d503b658cac841110b5 (patch)
treefc8afb564917fd3d563f53709ad6e470bb8dd9dd
parent0ebcf1dcd060704f1d6adb6891592ab969569b7d (diff)
downloadengrampa-7c0392372800f570d7706d503b658cac841110b5.tar.bz2
engrampa-7c0392372800f570d7706d503b658cac841110b5.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 d0eabc0..928a128 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,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 60e2796..fd23790 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");
}