[X2Go-Commits] [x2goclient] 48/87: macbuild.sh: use out-of-source build and do not overwrite the default shipped Makefile.
git-admin at x2go.org
git-admin at x2go.org
Wed Mar 4 22:14:42 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/cleanup
in repository x2goclient.
commit 5eef51fce7497c411952963567b25568b0cd0ac3
Author: Mihai Moldovan <ionic at ionic.de>
Date: Sat Feb 14 05:50:41 2015 +0100
macbuild.sh: use out-of-source build and do not overwrite the default shipped Makefile.
---
debian/changelog | 2 ++
macbuild.sh | 7 +++++++
2 files changed, 9 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 11c2952..6e1e292 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -208,6 +208,8 @@ x2goclient (4.0.3.2-0x2go1) unstable; urgency=medium
qmake.
- Specify -spec macx-g++ when using qmake in macbuild.sh.
- Directly reference project file for qmake in macbuild.sh.
+ - Use out-of-source build and do not overwrite the default shipped
+ Makefile in macbuild.sh.
-- X2Go Release Manager <git-admin at x2go.org> Thu, 19 Feb 2015 12:49:22 +0100
diff --git a/macbuild.sh b/macbuild.sh
index e5c4394..ac3cb4e 100755
--- a/macbuild.sh
+++ b/macbuild.sh
@@ -31,6 +31,11 @@ make clean
rm -rf "${APPBUNDLE}"
rm -rf "${DMGFILE}"
+[ -e "${BUILD_DIR}" ] && rm -rf "${BUILD_DIR}"
+
+mkdir "${BUILD_DIR}"
+pushd "${BUILD_DIR}"
+
phase "Running lrelease"
lrelease "${PROJECT}"
@@ -71,3 +76,5 @@ ${PKG_DMG} \
--symlink "/Applications: " \
--icon "./res/img/icons/x2go-mac.icns" \
--format "UDBZ"
+
+popd
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list