LYX_GIT_COMMIT_HASH is in config.h now

This commit is contained in:
Stephan Witt 2014-10-10 12:27:31 +02:00
parent 8ecb96c09a
commit 35722e58ec

View File

@ -303,11 +303,6 @@ if [ -z "${LyXVersion}" ]; then
LyXVersion=$(grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " ()") LyXVersion=$(grep AC_INIT "${LyxSourceDir}"/configure.ac | cut -d, -f2 | tr -d " ()")
fi fi
LyXVersionSuffix=${LyXVersionSuffix:-$(echo "${LyXVersion}" | cut -d. -f1-2)} LyXVersionSuffix=${LyXVersionSuffix:-$(echo "${LyXVersion}" | cut -d. -f1-2)}
case "${LyXVersion}" in
*dev*)
LyXGitCommitHash=$(cd "${LyxSourceDir}" ; git log -1 --pretty=format:%H)
;;
esac
LyxName="LyX" LyxName="LyX"
LyxBase="${LyxName}-${LyXVersion}" LyxBase="${LyxName}-${LyXVersion}"
@ -632,10 +627,6 @@ build_lyx() {
CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}" CPPFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}" LDFLAGS="${SDKROOT:+-isysroot ${SDKROOT}} -arch ${arch} ${MYCFLAGS}"
if [ -n "${LyXGitCommitHash}" ]; then
CPPFLAGS="${CPPFLAGS} -DLYX_GIT_COMMIT_HASH='${LyXGitCommitHash}'"
fi
if [ "$configure_qt_frameworks" = "yes" ]; then if [ "$configure_qt_frameworks" = "yes" ]; then
export QT_CORE_CFLAGS="-FQtCore" export QT_CORE_CFLAGS="-FQtCore"
export QT_CORE_LIBS="-framework QtCore" export QT_CORE_LIBS="-framework QtCore"