diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-07 18:12:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-07 18:12:59 -0600 |
| commit | 3dab92ac478e325406e7be9011afa9b7f7f0f83d (patch) | |
| tree | 07ea64e7677df39ae5241a3d551ee02287a3dfe3 | |
| parent | 1417de6c4454ee9d07a11ab0ab3dcba9f005c076 (diff) | |
| download | kaffeine-3dab92ac478e325406e7be9011afa9b7f7f0f83d.tar.gz kaffeine-3dab92ac478e325406e7be9011afa9b7f7f0f83d.zip | |
Rename include subdirectory to tde
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | aclocal.m4 | 6 | ||||
| -rw-r--r-- | kaffeine/src/player-parts/dummy-part/Makefile | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 12aa435..470a88f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" -test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ @@ -1805,8 +1805,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" -test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/kde $TDEDIR $kde_incdirs" +kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/include /opt/kde/include $x_includes $qt_includes" +test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs" AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) ac_kde_includes="$kde_incdir" @@ -2042,7 +2042,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon, kde_cxxflags_safe="$CXXFLAGS" LIBS="-lkde-qt-addon $LIBQT $LIBS" - CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" + CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" AC_TRY_LINK([ diff --git a/kaffeine/src/player-parts/dummy-part/Makefile b/kaffeine/src/player-parts/dummy-part/Makefile index f5a0ea2..ab0f712 100644 --- a/kaffeine/src/player-parts/dummy-part/Makefile +++ b/kaffeine/src/player-parts/dummy-part/Makefile @@ -101,7 +101,7 @@ KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_EXTRA_RPATH = KDE_HAS_DOXYGEN = no KDE_HAVE_DOT = NO -KDE_INCLUDES = -I/usr/include/kde +KDE_INCLUDES = -I/usr/include/tde KDE_LDFLAGS = -L/usr/lib KDE_MT_LDFLAGS = KDE_MT_LIBS = -lpthread @@ -220,7 +220,7 @@ X_RPATH = ac_ct_CC = gcc ac_ct_CXX = g++ ac_ct_F77 = -all_includes = -I/usr/include/kde -I/usr/share/qt3/include -I. +all_includes = -I/usr/include/tde -I/usr/share/qt3/include -I. all_libraries = -L/usr/share/qt3/lib am__fastdepCC_FALSE = # am__fastdepCC_TRUE = @@ -263,7 +263,7 @@ kde_confdir = ${datadir}/config kde_datadir = ${datadir}/apps kde_htmldir = ${datadir}/doc/HTML kde_icondir = ${datadir}/icons -kde_includes = /usr/include/kde +kde_includes = /usr/include/tde kde_kcfgdir = ${datadir}/config.kcfg kde_libraries = /usr/lib kde_libs_htmldir = /usr/share/doc/kde/HTML |