[fwbuilder-commits] [SCM] Firewall Builder GUI and Policy Compilers Open Source Code branch, develo
Brought to you by:
mikehorn
From: <gi...@ir...> - 2011-01-27 01:06:17
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Firewall Builder GUI and Policy Compilers Open Source Code". The branch, development has been updated via 959a10535d1ff103aa4db1af4e9be2bd66527dea (commit) via 9f8622e407563c1d3f3e4cbe278b9153911b7048 (commit) from 4d29ba9a6c20901d452a29e01f4598cd42e4e953 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 959a10535d1ff103aa4db1af4e9be2bd66527dea Merge: 9f8622e 4d29ba9 Author: Vadim Kurland <va...@sl...> Date: Wed Jan 26 17:05:53 2011 -0800 Merge branch 'development' of ssh://gi...@vc...:2222/var/git/fwbuilder into development commit 9f8622e407563c1d3f3e4cbe278b9153911b7048 Author: Vadim Kurland <va...@sl...> Date: Wed Jan 26 17:05:35 2011 -0800 see #1989 no need to put these in a qmake context diff --git a/src/libfwbuilder/qmake.inc.in b/src/libfwbuilder/qmake.inc.in index 379a496..db31919 100644 --- a/src/libfwbuilder/qmake.inc.in +++ b/src/libfwbuilder/qmake.inc.in @@ -31,16 +31,13 @@ unix { QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@ QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@ - !macx { - exec_prefix = @EXEC_PREFIX@ - DESTDIR = + exec_prefix = @EXEC_PREFIX@ + DESTDIR = - target.path = @LIBDIR@ - dtd.path = @RES_DIR@/ - migration.path = @RES_DIR@/migration - doc.path = @DOCDIR@ - - } + target.path = @LIBDIR@ + dtd.path = @RES_DIR@/ + migration.path = @RES_DIR@/migration + doc.path = @DOCDIR@ } exists(qmake2.inc) { ----------------------------------------------------------------------- Summary of changes: src/libfwbuilder/qmake.inc.in | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) hooks/post-receive -- Firewall Builder GUI and Policy Compilers Open Source Code |