diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-07 18:14:02 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-07 18:14:02 -0600 |
commit | 5837a0310e6aaf67514bc047037f49ccf1f76600 (patch) | |
tree | 41f2ad3f44ee4004e9e48b4e2b8125c7e75cf6ac | |
parent | c7cbe886968680ae4b14d34208162a82f862b5e4 (diff) | |
download | kmyfirewall-5837a0310e6aaf67514bc047037f49ccf1f76600.tar.gz kmyfirewall-5837a0310e6aaf67514bc047037f49ccf1f76600.zip |
Rename include subdirectory to tde
-rw-r--r-- | acinclude.m4 | 6 | ||||
-rw-r--r-- | config.log | 4 | ||||
-rwxr-xr-x | debian_woody_configure | 2 | ||||
-rw-r--r-- | doc/Makefile | 6 | ||||
-rw-r--r-- | doc/kmyfirewall/Makefile | 6 | ||||
-rwxr-xr-x | fedora_configuration | 2 | ||||
-rw-r--r-- | kmyfirewall/installer/openbsd/Makefile | 8 |
7 files changed, 17 insertions, 17 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 3748f81..02f1519 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1793,8 +1793,8 @@ fi if test -z "$1"; then -kde_incdirs="$kde_libs_prefix/include /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/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 /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([ @@ -4,7 +4,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by configure, which was generated by GNU Autoconf 2.61. Invocation command line was - $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-debug --prefix=/usr --sysconfdir=/etc --includedir=/usr/include/kde --infodir=/usr/share/info --mandir=/usr/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde + $ ./configure --host=x86_64-linux-gnu --build=x86_64-linux-gnu --disable-debug --prefix=/usr --sysconfdir=/etc --includedir=/usr/include/tde --infodir=/usr/share/info --mandir=/usr/share/man --with-qt-dir=/usr/share/qt3 --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde ## --------- ## ## Platform. ## @@ -293,7 +293,7 @@ include_ARTS_FALSE='' include_ARTS_TRUE='' include_x11_FALSE='' include_x11_TRUE='' -includedir='/usr/include/kde' +includedir='/usr/include/tde' infodir='/usr/share/info' install_sh='' kde_appsdir='' diff --git a/debian_woody_configure b/debian_woody_configure index 4aa2468..832700f 100755 --- a/debian_woody_configure +++ b/debian_woody_configure @@ -3,7 +3,7 @@ export kde_confdir="/etc/trinity" export kde_prefix="/usr" export kde_bindir="$kde_prefix/bin" -export kde_includedir="$kde_prefix/include/kde" +export kde_includedir="$kde_prefix/include/tde" export kde_libdir="$kde_prefix/lib" export kde_cgidir="$kde_prefix/lib/cgi-bin" export kde_moduledir="$kde_prefix/lib/trinity" diff --git a/doc/Makefile b/doc/Makefile index f9530cf..5bc0af1 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -118,7 +118,7 @@ KCONFIG_COMPILER = /usr/bin/kconfig_compiler KDECONFIG = /usr/bin/kde-config KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_EXTRA_RPATH = -KDE_INCLUDES = -I/usr/include/kde +KDE_INCLUDES = -I/usr/include/tde KDE_LDFLAGS = -L/usr/lib KDE_MT_LDFLAGS = KDE_MT_LIBS = -lpthread @@ -227,7 +227,7 @@ X_RPATH = ac_ct_CC = gcc ac_ct_CXX = g++ ac_ct_F77 = -all_includes = -I/usr/include/kde -I/usr/include/qt3 -I. +all_includes = -I/usr/include/tde -I/usr/include/qt3 -I. all_libraries = am__fastdepCC_FALSE = # am__fastdepCC_TRUE = @@ -268,7 +268,7 @@ kde_confdir = /etc/trinity kde_datadir = /usr/share/apps kde_htmldir = /usr/share/doc/kde/HTML kde_icondir = /usr/share/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 diff --git a/doc/kmyfirewall/Makefile b/doc/kmyfirewall/Makefile index 39073c2..457ccb4 100644 --- a/doc/kmyfirewall/Makefile +++ b/doc/kmyfirewall/Makefile @@ -102,7 +102,7 @@ KCONFIG_COMPILER = /usr/bin/kconfig_compiler KDECONFIG = /usr/bin/kde-config KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_EXTRA_RPATH = -KDE_INCLUDES = -I/usr/include/kde +KDE_INCLUDES = -I/usr/include/tde KDE_LDFLAGS = -L/usr/lib KDE_MT_LDFLAGS = KDE_MT_LIBS = -lpthread @@ -211,7 +211,7 @@ X_RPATH = ac_ct_CC = gcc ac_ct_CXX = g++ ac_ct_F77 = -all_includes = -I/usr/include/kde -I/usr/include/qt3 -I. +all_includes = -I/usr/include/tde -I/usr/include/qt3 -I. all_libraries = am__fastdepCC_FALSE = # am__fastdepCC_TRUE = @@ -252,7 +252,7 @@ kde_confdir = /etc/trinity kde_datadir = /usr/share/apps kde_htmldir = /usr/share/doc/kde/HTML kde_icondir = /usr/share/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 diff --git a/fedora_configuration b/fedora_configuration index 2808e94..eea462c 100755 --- a/fedora_configuration +++ b/fedora_configuration @@ -3,7 +3,7 @@ export kde_confdir="/etc/kde" export kde_prefix="/usr" export kde_bindir="$kde_prefix/bin" -export kde_includedir="$kde_prefix/include/kde" +export kde_includedir="$kde_prefix/include/tde" export kde_libdir="$kde_prefix/lib" export kde_cgidir="$kde_prefix/lib/cgi-bin" export kde_moduledir="$kde_prefix/lib/trinity" diff --git a/kmyfirewall/installer/openbsd/Makefile b/kmyfirewall/installer/openbsd/Makefile index e547328..6ac60db 100644 --- a/kmyfirewall/installer/openbsd/Makefile +++ b/kmyfirewall/installer/openbsd/Makefile @@ -156,7 +156,7 @@ KCONFIG_COMPILER = /usr/bin/kconfig_compiler KDECONFIG = /usr/bin/kde-config KDE_CHECK_PLUGIN = $(KDE_PLUGIN) -rpath $(libdir) KDE_EXTRA_RPATH = -KDE_INCLUDES = -I/usr/include/kde +KDE_INCLUDES = -I/usr/include/tde KDE_LDFLAGS = -L/usr/lib KDE_MT_LDFLAGS = KDE_MT_LIBS = -lpthread @@ -264,7 +264,7 @@ X_RPATH = ac_ct_CC = ac_ct_CXX = 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 = @@ -296,7 +296,7 @@ include_ARTS_FALSE = # include_ARTS_TRUE = include_x11_FALSE = # include_x11_TRUE = -includedir = /usr/include/kde +includedir = /usr/include/tde infodir = /usr/share/info install_sh = /home/agi/debian/kmyfirewall/kmyfirewall-1.1.1/admin/install-sh kde_appsdir = ${datadir}/applnk @@ -305,7 +305,7 @@ kde_confdir = /etc/trinity kde_datadir = ${datadir}/apps kde_htmldir = /usr/share/doc/kde/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 |