diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-07 18:15:57 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-07 18:15:57 -0600 |
| commit | da60dcc29f0831e881714aa36729ce6f05e95b0c (patch) | |
| tree | f39389ed45aec11ca6e16bc924f6f68f0b14deec | |
| parent | 230e5892cfd0ada63a82c7c13440ac2a01c694e6 (diff) | |
| download | koffice-da60dcc2.tar.gz koffice-da60dcc2.zip | |
Rename include subdirectory to tde
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | kexi/debian/debiandirs | 2 | ||||
| -rw-r--r-- | kexi/debian/libkexi-dev.install | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 861ec05c..f51be641 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1784,8 +1784,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" @@ -2021,7 +2021,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/kexi/debian/debiandirs b/kexi/debian/debiandirs index d341195a..ba70ea3f 100644 --- a/kexi/debian/debiandirs +++ b/kexi/debian/debiandirs @@ -1,6 +1,6 @@ export kde_prefix=/usr export sysconfdir=/etc -export kde_includedir=/usr/include/kde +export kde_includedir=/usr/include/tde export infodir=/usr/share/info export mandir=/usr/share/man export qtdir=/usr/share/qt3 diff --git a/kexi/debian/libkexi-dev.install b/kexi/debian/libkexi-dev.install index 27f2a0a7..8380318d 100644 --- a/kexi/debian/libkexi-dev.install +++ b/kexi/debian/libkexi-dev.install @@ -1,4 +1,4 @@ -debian/tmp/usr/include/kde/kexidb/ +debian/tmp/usr/include/tde/kexidb/ debian/tmp/usr/lib/libkexidb.la debian/tmp/usr/lib/libkexidb.so debian/tmp/usr/lib/libkexidbparser.so |