From c26027cba274f66858d346bca150af03473b0533 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Mon, 29 May 2017 15:26:18 +0000 Subject: Update CONFLICTS_INSTALL --- archivers/unrar/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archivers/unrar') diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile index c43d93fcc265..6e0bb90c8816 100644 --- a/archivers/unrar/Makefile +++ b/archivers/unrar/Makefile @@ -24,7 +24,7 @@ OPTIONS_DEFINE= OPENSSL_AES OPTIONS_DEFAULT=OPENSSL_AES OPENSSL_AES_DESC= Use OpenSSL implementation of AES -CONFLICTS_INSTALL?= zh-unrar-[0-9].* unrar-iconv-[0-9].* +CONFLICTS_INSTALL?= zh-unrar unrar-iconv LDFLAGS+= -lpthread MAKE_ARGS= CXX=${CXX} CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" STRIP=${STRIP_CMD} -- cgit