[mythtv] [PATCH] mfd non-standard prefix

[Jim Radford]

This patch fixes some compilation issues I had with mfd.

  o If you are using a non-standard prefix for myth then
    the lib directory needs to be added as well as the
    include directory.
  o Libraries from the source dir should be prefered to
    libraries already installed.
  o Redhat sticks cdda in /usr/include/cdda.

-Jim

Index: settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mfd/settings.pro,v
retrieving revision 1.3
diff -u -r1.3 settings.pro
--- settings.pro	2 Jan 2004 23:12:00 -0000	1.3
+++ settings.pro	12 Jan 2004 16:44:50 -0000
@@ -7,7 +7,11 @@
 
 INCLUDEPATH += $${PREFIX}/include
 INCLUDEPATH *= /usr/local/include
 
+INCLUDEPATH *= /usr/include/cdda
+
+LIBS *= -L$${PREFIX}/lib
+
 DEFINES += _GNU_SOURCE
 DEFINES += PREFIX=\"$${PREFIX}\"
 release {
Index: mfd/mfd.pro
===================================================================
RCS file: /var/lib/mythcvs/mfd/mfd/mfd.pro,v
retrieving revision 1.6
diff -u -r1.6 mfd.pro
--- mfd/mfd.pro	23 Dec 2003 01:01:15 -0000	1.6
+++ mfd/mfd.pro	12 Jan 2004 16:44:50 -0000
@@ -1,3 +1,7 @@
+INCLUDEPATH += ../mfdlib
+DEPENDPATH += ../mfdlib
+LIBS += -Wl,--export-dynamic $$EXTRA_LIBS -L../mfdlib/ -lmfdlib -Wl,-rpath,${PREFIX}/lib
+
 include ( ../settings.pro )
 
 !exists(../config.pro ) {
@@ -10,16 +14,12 @@
 
 include (../options.pro)
 
-INCLUDEPATH += ../mfdlib
-DEPENDPATH += ../mfdlib
-
 TEMPLATE = app
 CONFIG += thread
 target.path = $${PREFIX}/bin
 INSTALLS += target
 
 TARGET = mfd
-LIBS += -Wl,--export-dynamic $$EXTRA_LIBS -L../mfdlib/ -lmfdlib -Wl,-rpath,/usr/local/lib
 
 !isEmpty(USE_MYTH_LIB) {
 LIBS += -lmyth-$$LIBVERSION