[mythtv] [PATCH] mfd non-standard prefix ][

[Jim Radford]

On Mon, Jan 12, 2004 at 02:49:35PM -0500, thor wrote:
> On Monday 12 January 2004 11:50, Jim Radford wrote:
> > This patch fixes some compilation issues I had with mfd.

> Didn't think anyone was even compiling the mfd yet, let alone
> patching it :-)

Yep.  I'm intrigued by the zeroconf stuff so I added it to my build
script, except it hadn't built since the first time I built it.

> Thanks, applied this (and the mythdvd one).

Almost.  I admit that it looks odd to have settings.pro included after
setting a bunch of variables, but I think it is correct.  For example,
you want -L../mfdlib to come before -L$(PREFIX)/lib which may (and
most likely will in my case) have a previously installed version of
the lib.

Also, why did you change LIBS to LIB in my patch?  LIBS is the
standard qmake variable and it doesn't work with LIB.

With these changes it works (at least builds :-)) for me.

Thanks,
-Jim

Index: settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mfd/settings.pro,v
retrieving revision 1.4
diff -u -r1.4 settings.pro
--- settings.pro	12 Jan 2004 19:26:28 -0000	1.4
+++ settings.pro	13 Jan 2004 16:09:20 -0000
@@ -10,7 +10,7 @@
 
 INCLUDEPATH *= /usr/include/cdda
 
-LIB *= -L$${PREFIX}/lib
+LIBS *= -L$${PREFIX}/lib
 
 DEFINES += _GNU_SOURCE
 DEFINES += PREFIX=\"$${PREFIX}\"
Index: mfd/mfd.pro
===================================================================
RCS file: /var/lib/mythcvs/mfd/mfd/mfd.pro,v
retrieving revision 1.8
diff -u -r1.8 mfd.pro
--- mfd/mfd.pro	13 Jan 2004 04:55:00 -0000	1.8
+++ mfd/mfd.pro	13 Jan 2004 16:09:20 -0000
@@ -1,9 +1,9 @@
-include ( ../settings.pro )
-
 INCLUDEPATH += ../mfdlib
 DEPENDPATH += ../mfdlib
 LIBS += -Wl,--export-dynamic $$EXTRA_LIBS -L../mfdlib/ -lmfdlib -Wl,-rpath,$${PREFIX}/lib
 
+include ( ../settings.pro )
+
 !exists(../config.pro ) {
     error(Missing config.pro: please run the configure script)
 }