Merge branch 'master' of git.ardour.org:ardour/ardour
This commit is contained in:
commit
024dfe47f5
@ -52,7 +52,7 @@ done
|
||||
|
||||
|
||||
# Figure out the Build Type
|
||||
if grep -q "DEBUG = True" ../../build/c4che/default.cache.py; then
|
||||
if grep -q "DEBUG = True" ../../build/c4che/_cache.py; then
|
||||
DEBUG="T"
|
||||
else
|
||||
DEBUG="F"
|
||||
|
@ -371,9 +371,10 @@ fi
|
||||
################################
|
||||
# Setup derived variables
|
||||
################################
|
||||
PGM_VERSION=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $2 }')
|
||||
PGM_BUILD=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $3 }')
|
||||
PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | awk 'BEGIN { FS = "-" } ; { print $3 }')
|
||||
PGM_VERSION=$(echo ${BUNDLE_DIR} | cut -d- -f2)
|
||||
PGM_BUILD=$(echo ${BUNDLE_DIR} | cut -d- -f3)
|
||||
PGM_BUILDTYPE=$(echo ${BUNDLE_DIR} | cut -d- -f4)
|
||||
|
||||
|
||||
if [ -z ${PGM_BUILDTYPE} ];
|
||||
then
|
||||
@ -392,6 +393,8 @@ PGM_EXEC_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/bin/${PGM_EXEC_FILE}"
|
||||
ICON_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share/icons"
|
||||
MENU_FILE_PATH="${INSTALL_DEST_BASE}/${PGM_FULL_NAME}/share"
|
||||
|
||||
echo "VERSION [$PGM_VERSION] BUILD [$BUILD] FULLNAME[$PGM_FULL_NAME] EXECPATH [$PGM_EXEC_PATH]"
|
||||
|
||||
################################
|
||||
# Install bundle and Menu/Link
|
||||
################################
|
||||
|
Loading…
Reference in New Issue
Block a user