summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-07 18:18:26 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-07 18:18:26 -0600
commitfadd2e0f229a394ab032bcd8f25a53d6c471c6ab (patch)
tree5be0609f07bb7461888c726988c4b436b7881dee
parent175813312c994c57bae0f852404c85a318ecfb2a (diff)
downloadadmin-fadd2e0f229a394ab032bcd8f25a53d6c471c6ab.tar.gz
admin-fadd2e0f229a394ab032bcd8f25a53d6c471c6ab.zip
Rename include subdirectory to tde
-rw-r--r--acinclude.m4.in6
-rwxr-xr-xdebianrules2
2 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4.in b/acinclude.m4.in
index d66d04e..611f750 100644
--- a/acinclude.m4.in
+++ b/acinclude.m4.in
@@ -2026,8 +2026,8 @@ fi
if test -z "$1"; then
-kde_incdirs="$kde_libs_prefix/include /opt/trinity/include/kde /opt/trinity/include/kde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/trinity/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 /opt/trinity/include/tde /opt/trinity/include/tde /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/trinity/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"
@@ -2263,7 +2263,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"
if test "$kde_qtver" = "3"; then
diff --git a/debianrules b/debianrules
index abe5379..3b0ba59 100755
--- a/debianrules
+++ b/debianrules
@@ -9,7 +9,7 @@ chomp $origPwd;
$kde_prefix = "/usr";
$sysconfdir = "/etc";
-$kde_includedir = "$kde_prefix/include/kde";
+$kde_includedir = "$kde_prefix/include/tde";
$infodir = "$kde_prefix/share/info";
$mandir = "$kde_prefix/share/man";
$qtdir = "/usr/share/tqt3";