[pacman-dev] [PATCH] Fix FS#33318 - Make makepkg check for $pkgdir and $srcdir before manpage compression.

Richard Pougnet richard at pougnet.ca
Sat Jan 26 16:17:13 EST 2013


Call check_package() before calling tidy_package to check for references
to $srcdir and $pkgdir before manpages are compressed. This allows
any references inserted into manpages during the build to be retained.
---
 scripts/makepkg.sh.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index dcd920d..e28b7fd 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2790,9 +2790,9 @@ if (( INFAKEROOT )); then
 		else
 			run_package
 		fi
-		tidy_install
 		create_package
 		create_debug_package
+		tidy_install
 		pkgdir="${pkgdir%/*}"
 	else
 		run_split_packaging
@@ -2930,9 +2930,9 @@ else
 					warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"
 					plain "$(gettext "File permissions may not be preserved.")"
 			fi
-			tidy_install
 			create_package
 			create_debug_package
+			tidy_install
 			pkgdir="${pkgdir%/*}"
 		else
 			run_split_packaging
-- 
1.8.1.1



More information about the pacman-dev mailing list