Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move external libs installed includes under $PREFIX/include/mythtv
Also removed the useless libmythqjson.prl file

Fixes #10859.  Fixes #10860.  Fixes #10861.
  • Loading branch information
Beirdo committed Jul 1, 2012
1 parent aa93d3f commit b6d65fc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion mythtv/external/Makefile
Expand Up @@ -23,7 +23,9 @@ zeromq-all: zeromq/Makefile
${MAKE} -C zeromq all

zeromq/Makefile: zeromq/configure
(cd zeromq ; ./configure --without-documentation --prefix=${PREFIX})
(cd zeromq ; \
./configure --without-documentation --prefix=${PREFIX} \
--includedir=${PREFIX}/include/mythtv/zeromq)

zeromq-install zeromq-uninstall zeromq-clean zeromq-distclean:
${MAKE} -C zeromq ${@:zeromq-%=%} DESTDIR=${INSTALL_ROOT}
Expand Down
2 changes: 1 addition & 1 deletion mythtv/external/nzmqt/src/nzmqt.pro
Expand Up @@ -41,6 +41,6 @@ QMAKE_LIBDIR += \
../../zeromq/src/.libs

inc.files += ../include/nzmqt/nzmqt.hpp
inc.path = $${PREFIX}/include/
inc.path = $${PREFIX}/include/mythtv/nzmqt/

INSTALLS += inc
6 changes: 3 additions & 3 deletions mythtv/external/qjson/src/src.pro
Expand Up @@ -8,7 +8,7 @@ QT -= gui
TARGET = mythqjson
target.path = $${LIBDIR}
DESTDIR = $$QJSON_BASE/lib
CONFIG += create_prl
#CONFIG += create_prl
INSTALLS = target

!mingw {
Expand Down Expand Up @@ -83,7 +83,7 @@ symbian: {
}

inc.files += $${PUBLIC_HEADERS}
inc.path = $${PREFIX}/include/QJson/
inc.path = $${PREFIX}/include/mythtv/QJson/

INSTALLS += inc

Expand All @@ -93,7 +93,7 @@ PUBLIC_CPPHEADERS += \
Parser

cppinc.files += $${PUBLIC_CPPHEADERS}
cppinc.path += $${PREFIX}/include/QJson/
cppinc.path += $${PREFIX}/include/mythtv/QJson/

INSTALLS += cppinc

0 comments on commit b6d65fc

Please sign in to comment.