From 3c10661d819aad1132195fbdae87b7f8a2825a49 Mon Sep 17 00:00:00 2001 From: Max Prokhorov Date: Mon, 14 May 2018 09:59:43 +0300 Subject: [PATCH] Use correct outdir --- rpm/genrpm.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rpm/genrpm.sh b/rpm/genrpm.sh index 0c28c242..9ed25cb9 100755 --- a/rpm/genrpm.sh +++ b/rpm/genrpm.sh @@ -6,14 +6,13 @@ NAME=shadowsocks-libev SELF=$(readlink -f -- "$0") HERE=$(dirname -- "$SELF") -OUTDIR="${HERE}"/SRPMS SOURCES="${HERE}"/SOURCES SPEC_TEMPLATE="${HERE}"/SPECS/${NAME}.spec.in SPEC_FILE="${SPEC_TEMPLATE%%.in}" GIT_VERSION=$("${HERE}"/../scripts/git_version.sh) -OPT_OUTDIR="${OUTDIR}" +OPT_OUTDIR="${HERE}/SRPMS" OPT_USE_SYSTEM_LIB=0 OUT_BUILD_RPM=0 @@ -38,8 +37,7 @@ build_src_rpm() build_rpm() { - echo "${OPT_USE_SYSTEM_LIB}" - rpmbuild --rebuild "${OUTDIR}"/${name_version}.src.rpm \ + rpmbuild --rebuild "${OPT_OUTDIR}"/${name_version}.src.rpm \ --define "%_topdir ${HERE}" \ --define "%use_system_lib ${OPT_USE_SYSTEM_LIB}" }