[mythtv] [PATCH] PREFIX in mythbrowser

Jim Radford radford+myth at blackbean.org
Sun Dec 21 21:36:13 EST 2003


This allows mythbookmarkmanager to find mythbrowser without
configuration when PREFIX is not the default /usr/local.

-Jim

Index: mythbookmarkmanager/bookmarkmanager.cpp
===================================================================
RCS file: /var/lib/mythcvs/mythbrowser/mythbookmarkmanager/bookmarkmanager.cpp,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bookmarkmanager.cpp
--- mythbookmarkmanager/bookmarkmanager.cpp	29 Oct 2003 16:04:50 -0000	1.1.1.1
+++ mythbookmarkmanager/bookmarkmanager.cpp	22 Dec 2003 01:35:07 -0000
@@ -292,7 +292,7 @@
     browser->setRW(true);
     browser->setHelpText("this is the help line");
     hbox2->addWidget(browser);
-    browser->setText(gContext->GetSetting("WebBrowserCommand", "/usr/local/bin/mythbrowser"));
+    browser->setText(gContext->GetSetting("WebBrowserCommand", PREFIX "/bin/mythbrowser"));
 
     // Add new bookmark ------------------------------------
     QHBoxLayout *hbox = new QHBoxLayout(vbox);
@@ -487,7 +487,7 @@
 
 void Bookmarks::slotBookmarksViewExecuted(QListViewItem *item)
 {
-    QString cmd = gContext->GetSetting("WebBrowserCommand","/usr/local/bin/mythbrowser");
+    QString cmd = gContext->GetSetting("WebBrowserCommand", PREFIX "/bin/mythbrowser");
     QString zoom = QString(" -z %1 ").arg(gContext->GetNumSetting("WebBrowserZoomLevel",200));
 
     if(!item)
Index: settings.pro
===================================================================
RCS file: /var/lib/mythcvs/mythbrowser/settings.pro,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 settings.pro
--- settings.pro	29 Oct 2003 16:04:45 -0000	1.1.1.1
+++ settings.pro	22 Dec 2003 01:35:07 -0000
@@ -8,6 +8,8 @@
 INCLUDEPATH += $${PREFIX}/include
 INCLUDEPATH *= /usr/local/include
 
+LIBS *= -L$${PREFIX}/lib
+
 DEFINES += _GNU_SOURCE
 DEFINES += PREFIX=\"$${PREFIX}\"
 release {


More information about the mythtv-dev mailing list