From fc5fb26e314338286f0cccf3edb67c9083e7b0f9 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 10 Jan 2023 12:47:48 +0800 Subject: [PATCH] ghc_gen_filelists: define basepkg later just suppressed warning if error encountered around echo --- macros.ghc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/macros.ghc b/macros.ghc index ed3eb0b..75919ca 100644 --- a/macros.ghc +++ b/macros.ghc @@ -84,11 +84,11 @@ fi\ %define pkgname %{?1}%{!?1:%{pkg_name}}\ %define pkgver %{?2}%{!?2:%{version}}\ %define pkgnamever %{pkgname}-%{pkgver}\ -%define basepkg %{ghc_prefix}-%{pkgname}\ if [ -z "$(ls %{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf)" ]; then\ -echo '%{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf not found'\ +echo "%{buildroot}%{ghcliblib}/package.conf.d/%{pkgnamever}*.conf not found"\ exit 1\ fi\ +%define basepkg %{ghc_prefix}-%{pkgname}\ rm -f %{basepkg}.files %{basepkg}-doc.files\ touch %{basepkg}.files %{basepkg}-doc.files\ %if 0%{?1:1}\