Improved standard conformance of private frameworks naming scheme

(cherry picked from commit 5ccb7da134cc8a8e2d3837f4d85e23f95d7aae6b)

diff --git a/development/LyX-Mac-binary-release.sh b/development/LyX-Mac-binary-release.sh
index af00aa2abee70a976bcc7f236ef48294fe10e330..8272cf5380cbd1d937fb5cb0bc3ebe491dbc2cd6 100644 (file)
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -741,26 +741,25 @@ private_framework() {
        fwvrsn="1"
        mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers
        mkdir -p "${condir}/${fwdir}"/Versions/${fwvrsn}/Resources
-       if [ ! -f "${condir}/${fwdir}/Versions/${fwvrsn}/${libnm}" ]; then
-               cp -p "${source}" "${condir}/${fwdir}/Versions/${fwvrsn}/${libnm}"
+       if [ ! -f "${condir}/${fwdir}/Versions/${fwvrsn}/${fwname}" ]; then
+               cp -p "${source}" "${condir}/${fwdir}/Versions/${fwvrsn}/${fwname}"
                for hfile in "$@" ; do
                        test -f "${hfile}" && cp -p "${hfile}" "${condir}/${fwdir}"/Versions/${fwvrsn}/Headers
                done
                ln -s ${fwvrsn} "${condir}/${fwdir}/Versions/Current"
                ln -s Versions/Current/Headers "${condir}/${fwdir}/Headers"
                ln -s Versions/Current/Resources "${condir}/${fwdir}/Resources"
-               ln -s Versions/Current/"${libnm}" "${condir}/${fwdir}/${libnm}"
-               ln -s Versions/Current/"${libnm}" "${condir}/${fwdir}/${fwname}"
-               installname -id "@executable_path/../${fwdir}/${libnm}" "${condir}/${fwdir}/${libnm}"
+               ln -s Versions/Current/"${fwname}" "${condir}/${fwdir}/${fwname}"
+               installname -id "@executable_path/../${fwdir}/${fwname}" "${condir}/${fwdir}/${fwname}"
                if [ -f "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist ]; then
                        cat "${LyxSourceDir}"/development/LyX-Mac-frameworks-template.plist | sed \
-                               -e "s/@CFBundleExecutable@/${libnm}/" \
+                               -e "s/@CFBundleExecutable@/${fwname}/" \
                                -e "s/@CFBundleIdentifier@/${libid}/" \
                                -e "s/@CFBundleShortVersionString@/${svrsn}/" \
                                -e "s/@CFBundleVersion@/${version}/" > "${condir}/${fwdir}"/Resources/Info.plist
                fi
        fi
-       installname -change "${source}" "@executable_path/../${fwdir}/${libnm}" "${target}"
+       installname -change "${source}" "@executable_path/../${fwdir}/${fwname}" "${target}"
 }
 
 deploy_qtlibs() {