From ac983adf4c08f9e740859e7455fe890da4eb546b Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Thu, 18 Apr 2013 19:15:24 -0500 Subject: [PATCH] Fix hard-coded references. --- admin | 2 +- kaffeine/src/player-parts/dummy-part/Makefile | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/admin b/admin index 307fab5..4027b87 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit 307fab5fdad542247fa11a418be0e9635f4b5ebf +Subproject commit 4027b878fb556a51ed29affd578e78aa70997480 diff --git a/kaffeine/src/player-parts/dummy-part/Makefile b/kaffeine/src/player-parts/dummy-part/Makefile index 6497d29..e7e68d2 100644 --- a/kaffeine/src/player-parts/dummy-part/Makefile +++ b/kaffeine/src/player-parts/dummy-part/Makefile @@ -68,9 +68,9 @@ CXXCPP = g++ -E CXXDEPMODE = depmode=gcc3 CXXFLAGS = -Wno-long-long -Wundef -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -O2 -Wformat-security -Wmissing-format-attribute -Wno-non-virtual-dtor -fno-exceptions -fno-check-new -fno-common -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION CYGPATH_W = echo -DCOPIDL = /usr/bin/dcopidl -DCOPIDL2CPP = /usr/bin/dcopidl2cpp -DCOPIDLNG = /usr/bin/dcopidlng +DCOPIDL = ${prefix}/bin/dcopidl +DCOPIDL2CPP = ${prefix}/bin/dcopidl2cpp +DCOPIDLNG = ${prefix}/bin/dcopidlng DCOP_DEPENDENCIES = $(DCOPIDL) $(DCOPIDLNG) DEFS = -DHAVE_CONFIG_H DEPDIR = .deps @@ -95,8 +95,8 @@ INSTALL_PROGRAM = ${INSTALL} $(INSTALL_STRIP_FLAG) INSTALL_SCRIPT = ${INSTALL} INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s KCFG_DEPENDENCIES = $(KCONFIG_COMPILER) -KCONFIG_COMPILER = /usr/bin/tdeconfig_compiler -KDECONFIG = /usr/bin/tde-config +KCONFIG_COMPILER = ${prefix}/bin/tdeconfig_compiler +KDECONFIG = ${prefix}/bin/tde-config KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_EXTRA_RPATH = KDE_HAS_DOXYGEN = no @@ -176,7 +176,7 @@ LTLIBOBJS = MAKEINFO = ${SHELL} /partage/Linux/site/tmp/kaffeine-0.8.8/admin/missing --run makeinfo MAKEKDEWIDGETS = /usr/bin/maketdewidgets MCOPIDL = -MEINPROC = /usr/bin/meinproc +MEINPROC = ${prefix}/bin/meinproc MOC = /usr/share/qt3/bin/moc MSGFMT = /usr/bin/msgfmt NOOPT_CFLAGS = -O0