diff options
| author | Timothy Pearson <[email protected]> | 2012-02-07 18:12:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-02-07 18:12:01 -0600 |
| commit | 4fcd8d9a5efb637ff562f7ae5610562bfddcc1c8 (patch) | |
| tree | 89c0208ba7a045faf6706eb32c2859c7e9e6d998 | |
| parent | c7903681d47b16342b4b8be3cbea6ff7ed8fb7d0 (diff) | |
| download | amarok-4fcd8d9a5efb637ff562f7ae5610562bfddcc1c8.tar.gz amarok-4fcd8d9a5efb637ff562f7ae5610562bfddcc1c8.zip | |
Rename include subdirectory to tde
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | amarok/src/engine/helix/Makefile.test | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index fb1eb8b8..96a42fa0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1817,8 +1817,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" @@ -2054,7 +2054,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/amarok/src/engine/helix/Makefile.test b/amarok/src/engine/helix/Makefile.test index fae7489a..e26febfe 100644 --- a/amarok/src/engine/helix/Makefile.test +++ b/amarok/src/engine/helix/Makefile.test @@ -15,7 +15,7 @@ LIBOBJS=$(LIBSRCS:.cpp=.o) INCLUDES=\ -I/usr/lib/qt-3.3/include \ - -I/usr/include/kde \ + -I/usr/include/tde \ -I./helix-sp \ -I../.. \ -I. \ |