[mythtv] [PATCH] packaging: easier PREFIX change in settings.pro
Jeff Thompson
lists at threeputt.org
Mon Dec 13 19:44:39 UTC 2004
Hi, this patch is based on Jeremiah Morris's previous patch to
settings.pro. Jeremiah's patch allowed the PREFIX to be specified as an
argument to qmake. This patch expands that concept to the rest of the
mythtv CVS modules.
One additional change this patch makes is to remove the INCLUDEPATH *=
/usr/local/include statement from settings.pro. It would appear that the
INCLUDEPATH += $${PREFIX}/include provides the correct include path and
if PREFIX is set to anything other than /usr/local, then
/usr/local/include probably shouldn't be added to the INCLUDEPATH.
Please consider this patch for inclusion into CVS.
Thanks,
--
jthomps
-------------- next part --------------
Index: mfd/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mfd/settings.pro,v
retrieving revision 1.8
diff -u -r1.8 settings.pro
--- mfd/settings.pro 7 Sep 2004 21:21:33 -0000 1.8
+++ mfd/settings.pro 13 Dec 2004 16:03:19 -0000
@@ -1,12 +1,13 @@
CONFIG += debug
#CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
LIBVERSION = 0.16
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
LIBS *= -L$${PREFIX}/lib
Index: mfe/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mfe/settings.pro,v
retrieving revision 1.2
diff -u -r1.2 settings.pro
--- mfe/settings.pro 26 Aug 2004 19:42:37 -0000 1.2
+++ mfe/settings.pro 13 Dec 2004 16:03:19 -0000
@@ -1,10 +1,11 @@
CONFIG += debug
#CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
DEFINES += _GNU_SOURCE
DEFINES += PREFIX=\"$${PREFIX}\"
Index: mythbrowser/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythbrowser/settings.pro,v
retrieving revision 1.5
diff -u -r1.5 settings.pro
--- mythbrowser/settings.pro 7 Sep 2004 21:23:06 -0000 1.5
+++ mythbrowser/settings.pro 13 Dec 2004 16:03:19 -0000
@@ -1,12 +1,13 @@
#CONFIG += debug
CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
LIBVERSION = 0.16
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
LIBS *= -L$${PREFIX}/lib
Index: mythdvd/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythdvd/settings.pro,v
retrieving revision 1.10
diff -u -r1.10 settings.pro
--- mythdvd/settings.pro 7 Sep 2004 21:23:26 -0000 1.10
+++ mythdvd/settings.pro 13 Dec 2004 16:03:19 -0000
@@ -1,12 +1,13 @@
#CONFIG += debug
CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
LIBVERSION = 0.16
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
LIBS *= -L$${PREFIX}/lib
Index: mythgallery/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythgallery/settings.pro,v
retrieving revision 1.9
diff -u -r1.9 settings.pro
--- mythgallery/settings.pro 4 Aug 2003 01:03:41 -0000 1.9
+++ mythgallery/settings.pro 13 Dec 2004 16:03:20 -0000
@@ -1,10 +1,11 @@
#CONFIG += debug
CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
DEFINES += _GNU_SOURCE
DEFINES += PREFIX=\"$${PREFIX}\"
Index: mythgame/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythgame/settings.pro,v
retrieving revision 1.10
diff -u -r1.10 settings.pro
--- mythgame/settings.pro 4 Aug 2003 01:04:39 -0000 1.10
+++ mythgame/settings.pro 13 Dec 2004 16:03:20 -0000
@@ -1,10 +1,11 @@
#CONFIG += debug
CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
DEFINES += _GNU_SOURCE
DEFINES += PREFIX=\"$${PREFIX}\"
Index: mythmusic/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythmusic/settings.pro,v
retrieving revision 1.14
diff -u -r1.14 settings.pro
--- mythmusic/settings.pro 9 Aug 2003 20:57:10 -0000 1.14
+++ mythmusic/settings.pro 13 Dec 2004 16:03:20 -0000
@@ -1,10 +1,11 @@
#CONFIG += debug
CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
#INCLUDEPATH += /usr/include/cdda
#INCLUDEPATH += /usr/include/FLAC
Index: mythnews/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythnews/settings.pro,v
retrieving revision 1.2
diff -u -r1.2 settings.pro
--- mythnews/settings.pro 29 Dec 2003 04:27:43 -0000 1.2
+++ mythnews/settings.pro 13 Dec 2004 16:03:20 -0000
@@ -1,12 +1,14 @@
#CONFIG += debug
CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
+
# FOR Debian
#PREFIX = /usr
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
LIBPATH += $${PREFIX}/lib
Index: mythphone/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythphone/settings.pro,v
retrieving revision 1.5
diff -u -r1.5 settings.pro
--- mythphone/settings.pro 12 Nov 2004 18:47:05 -0000 1.5
+++ mythphone/settings.pro 13 Dec 2004 16:03:20 -0000
@@ -1,11 +1,13 @@
CONFIG += debug
#CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
+
MYTHLIBDIR = ../../mythtv/libs/
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
INCLUDEPATH += $${MYTHLIBDIR}
DEFINES += _GNU_SOURCE
Index: mythtv/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythtv/settings.pro,v
retrieving revision 1.79
diff -u -r1.79 settings.pro
--- mythtv/settings.pro 9 Dec 2004 22:58:49 -0000 1.79
+++ mythtv/settings.pro 13 Dec 2004 16:03:21 -0000
@@ -8,7 +8,6 @@
LIBVERSION = 0.16
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
DEFINES += _GNU_SOURCE
DEFINES += _FILE_OFFSET_BITS=64
Index: mythui/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythui/settings.pro,v
retrieving revision 1.3
diff -u -r1.3 settings.pro
--- mythui/settings.pro 21 Jul 2004 00:38:56 -0000 1.3
+++ mythui/settings.pro 13 Dec 2004 16:03:23 -0000
@@ -1,12 +1,13 @@
#CONFIG += debug
CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
LIBVERSION = 0.15
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
DEFINES += _GNU_SOURCE
DEFINES += _FILE_OFFSET_BITS=64
Index: mythvideo/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythvideo/settings.pro,v
retrieving revision 1.8
diff -u -r1.8 settings.pro
--- mythvideo/settings.pro 19 Aug 2004 20:41:56 -0000 1.8
+++ mythvideo/settings.pro 13 Dec 2004 16:03:23 -0000
@@ -1,10 +1,11 @@
#CONFIG += debug
CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
INCLUDEPATH *= $${PREFIX}/include/mythtv
DEFINES += _GNU_SOURCE
Index: mythweather/settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythweather/settings.pro,v
retrieving revision 1.6
diff -u -r1.6 settings.pro
--- mythweather/settings.pro 29 Dec 2003 04:27:01 -0000 1.6
+++ mythweather/settings.pro 13 Dec 2004 16:03:23 -0000
@@ -1,10 +1,11 @@
#CONFIG += debug
CONFIG += release
-PREFIX = /usr/local
+isEmpty( PREFIX ) {
+ PREFIX = /usr/local
+}
INCLUDEPATH += $${PREFIX}/include
-INCLUDEPATH *= /usr/local/include
LIBPATH += $${PREFIX}/lib
More information about the mythtv-dev
mailing list