osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use the same destination directory everywhere. If we're building an NSIS 

package, assume that we're doing a "release" build.

svn path=/trunk/; revision=47615
This commit is contained in:
Gerald Combs 2013-02-10 19:45:43 +00:00
parent af28be3598
commit a22790ae51
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packaging/nsis/Makefile.nmake
View File

@ -211,8 +211,8 @@ NSIS_FLAGS=\
!IFDEF HHC_DIR
/DHHC_DIR="$(HHC_DIR)" \
!ENDIF
!IF EXIST("..\..\wireshark-qt\qtshark.exe")
/DQT_DIR="..\..\wireshark-qt" \
!IF EXIST("..\..\wireshark-qt-release\qtshark.exe")
/DQT_DIR="..\..\wireshark-qt-release" \
!ENDIF
$(STAGING_DIR)\uninstall.exe : $(NSI)

17
ui/qt/QtShark.pro
View File

@ -25,8 +25,6 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#
QT += core gui
macx {
@ -37,7 +35,16 @@ macx {
TEMPLATE = app
QMAKE_INFO_PLIST = ../../packaging/macosx/Info.plist
TOP_SRCDIR = "$$PWD/../.."
CONFIG(debug, debug|release) {
DESTDIR = "$${TOP_SRCDIR}/wireshark-qt-debug"
}
CONFIG(release, debug|release) {
DESTDIR = "$${TOP_SRCDIR}/wireshark-qt-release"
}
QMAKE_INFO_PLIST = "$$PWD/../../packaging/macosx/Info.plist"
xxx {
message( )
@ -122,8 +129,6 @@ win32 {
error("Can't find config.pri. Have you run 'nmake -f Makefile.nmake' two directories up?")
}
DESTDIR = ../../wireshark-qt
!wireshark_manifest_info_required {
CONFIG -= embed_manifest_dll
CONFIG -= embed_manifest_exe
@ -313,7 +318,7 @@ unix:!macx {
# qmake 2.01a / Qt 4.7.0 doesn't set DESTDIR on OS X.
macx {
for(FILE,EXTRA_BINFILES){
QMAKE_POST_LINK += $$quote(cp $${FILE} $${TARGET}.app/Contents/MacOS$$escape_expand(\\n\\t))
QMAKE_POST_LINK += $$quote(cp $${FILE} $${DESTDIR}/$${TARGET}.app/Contents/MacOS$$escape_expand(\\n\\t))
}
}