From ca1b359ff3c3701745e1e5f564f453774e9de120 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
Date: Sun, 5 Mar 2023 16:04:00 +0100
Subject: [PATCH] lilypond: fix secondaryArch (x86) build (2nd try) (#7913)

---
 media-sound/lilypond/lilypond-2.24.1.recipe | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/media-sound/lilypond/lilypond-2.24.1.recipe b/media-sound/lilypond/lilypond-2.24.1.recipe
index 49426b36a..ffe7f9404 100644
--- a/media-sound/lilypond/lilypond-2.24.1.recipe
+++ b/media-sound/lilypond/lilypond-2.24.1.recipe
@@ -5,7 +5,7 @@ printouts. LilyPond is free software and part of the GNU Project."
 HOMEPAGE="https://lilypond.org/"
 COPYRIGHT="1993-2023 The LilyPond development team"
 LICENSE="GNU GPL v3"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://lilypond.org/download/source/v${portVersion%.*}/lilypond-$portVersion.tar.gz"
 CHECKSUM_SHA256="d5c59087564a5cd6f08a52ba80e7d6509b91c585e44385dcc0fa39265d181509"
 PATCHES="lilypond-$portVersion.patchset"
@@ -173,15 +173,18 @@ INSTALL()
 	make install-bytecode
 	PATH=${PATH/.:/} make install-doc
 
+	# not using $docDir here because that contains $secondaryArchSuffix
+	# (which is not used in BUILD() above)
+
 	# language specific doc packages
 	for lang in "${languages[@]}"; do
 		packageEntries doc_${lang} \
-			$(find $docDir -name "*.${lang}.*")
+			$(find $documentationDir/packages/lilypond -name "*.${lang}.*")
 	done
 
 	# generic and english doc package
 	packageEntries doc \
-		$docDir $infoDir
+		$documentationDir/packages $infoDir
 }
 
 TEST()