Normalize whitespace and other merge details

2024-12-23 00:18:20 +00:00
parent 6c9f0897af
commit d04cff3d6c
37 changed files with 1100 additions and 1962 deletions
--- a/release/Welcome.rtf.in
+++ b/release/Welcome.rtf.in
@@ -14,4 +14,4 @@

 \f0 \cf0 \
 from the command line.\
-}
+}
--- a/release/makemacpkg.in
+++ b/release/makemacpkg.in
@@ -161,7 +161,7 @@ install_subbuild()

 if [ "$BUILDDIRARMV8" != "" ]; then
 	install_subbuild $BUILDDIRARMV8 Armv8 armv8 arm64
-	fi
+fi

 install_name_tool -id $LIBDIR/$LIBJPEG_DSO_NAME $PKGROOT/$LIBDIR/$LIBJPEG_DSO_NAME
 install_name_tool -id $LIBDIR/$TURBOJPEG_DSO_NAME $PKGROOT/$LIBDIR/$TURBOJPEG_DSO_NAME