From 6783c63eeefaa7c96fa99ddb3cbfe3cb603bddbc Mon Sep 17 00:00:00 2001 From: David Adam Date: Wed, 2 Jan 2019 21:36:55 +0800 Subject: [PATCH] fish.spec: tidy up extra CMake arguments --- fish.spec.in | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fish.spec.in b/fish.spec.in index 70d0b190b..d929ec412 100644 --- a/fish.spec.in +++ b/fish.spec.in @@ -49,11 +49,12 @@ EXTRA_CMAKE_FLAGS="-DCURSES_EXTRA_LIBRARY=tinfo" export CXXFLAGS="$CXXFLAGS -march=i686" %endif %endif -# CMake macros on OpenSUSE and Fedora define the wrong sysconfdir arguments +# CMake macros define the wrong sysconfdir arguments +EXTRA_CMAKE_FLAGS="$EXTRA_CMAKE_FLAGS -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}" %if 0%{?rhel_version} && 0%{?rhel_version} < 800 -%cmake3 -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} $EXTRA_CMAKE_FLAGS +%cmake3 $EXTRA_CMAKE_FLAGS %else -%cmake -DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir} $EXTRA_CMAKE_FLAGS +%cmake $EXTRA_CMAKE_FLAGS %endif %if 0%{?make_jobs:1} %make_jobs