Makefile | 9 +++------ src/prefsubtitles.cpp | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index bae45d3..fb45d6f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ -PREFIX=/usr/local -#PREFIX=/tmp/smplayer +PREFIX=/usr CONF_PREFIX=$(PREFIX) @@ -10,14 +9,12 @@ TRANSLATION_PATH=$(PREFIX)/share/smplayer/translations THEMES_PATH=$(PREFIX)/share/smplayer/themes SHORTCUTS_PATH=$(PREFIX)/share/smplayer/shortcuts -#KDE_PREFIX=`kde-config --prefix` -#KDE_PREFIX=/tmp/smplayer/kde/ KDE_PREFIX=$(PREFIX) KDE_ICONS=$(KDE_PREFIX)/share/icons/hicolor/ KDE_APPLNK=$(KDE_PREFIX)/share/applications/ -QMAKE=qmake +QMAKE=qmake-qt4 LRELEASE=lrelease DEFS=DATA_PATH=\\\"$(DATA_PATH)\\\" \ @@ -41,7 +38,7 @@ endif src/smplayer: ./get_svn_revision.sh - +cd src && $(QMAKE) $(QMAKE_OPTS) && $(DEFS) make + +cd src && $(QMAKE) $(QMAKE_OPTS) "QMAKE_CFLAGS+=$(OPTFLAGS)" "QMAKE_CXXFLAGS+=$(OPTFLAGS)" smplayer.pro && $(DEFS) make cd src && $(LRELEASE) smplayer.pro clean: diff --git a/src/prefsubtitles.cpp b/src/prefsubtitles.cpp index a085c84..c4bafe2 100644 --- a/src/prefsubtitles.cpp +++ b/src/prefsubtitles.cpp @@ -463,7 +463,7 @@ void PrefSubtitles::createHelp() { #ifdef Q_OS_WIN .arg("C:\\Windows\\Fonts\\") #else - .arg("/usr/X11R6/lib/X11/fonts/truetype/") + .arg("/usr/share/fonts/default/TrueType-val/") #endif );