From 4f552ad804231874ea6d0d6551916b648817ca59 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Tue, 19 Jul 2022 13:57:00 +0800
Subject: [PATCH] ghc_bin_build,ghc_lib_build: define ghc_debuginfo to really
 enable debuginfo

---
 ghc-rpm-macros.spec | 5 ++++-
 macros.ghc          | 8 ++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 777ab4a..bdccb33 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -7,7 +7,7 @@
 %endif
 
 Name:           ghc-rpm-macros
-Version:        2.4.1
+Version:        2.4.2
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -183,6 +183,9 @@ EOF
 
 
 %changelog
+* Tue Jul 19 2022 Jens Petersen <petersen@redhat.com> - 2.4.2-1
+- ghc_bin_build,ghc_lib_build: define ghc_debuginfo to really enable debuginfo
+
 * Sun Jul 17 2022 Jens Petersen <petersen@redhat.com> - 2.4.1-1
 - ghc_bin_build,ghc_lib_build: use ghc_debuginfo to enable debuginfo
 
diff --git a/macros.ghc b/macros.ghc
index 0b2bc39..be19641 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -149,18 +149,14 @@ done\
 # ghc_bin_build
 %ghc_bin_build\
 %ghc_fix_doc_perms\
-%if %{undefined ghc_debuginfo}\
-%undefine _enable_debug_packages\
-%endif\
+%{?!ghc_debuginfo:%undefine _enable_debug_packages}\
 %cabal_configure\
 %cabal build %{?ghc_smp_mflags} %{?cabal_build_options}
 
 # ghc_lib_build_without_haddock [name] [version]
 %ghc_lib_build_without_haddock()\
 %ghc_fix_doc_perms\
-%if %{undefined ghc_debuginfo}\
-%undefine _enable_debug_packages\
-%endif\
+%{?!ghc_debuginfo:%undefine _enable_debug_packages}\
 %if 0%{?rhel} && 0%{?rhel} < 8\
 licensedirversion=%{?2:-%2}\
 %endif\