Rename KDE_BINDIR to TDE_BINDIR

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

6 files changed, 11 insertions, 11 deletions

diff --git a/config.h.cmake b/config.h.cmake
index 1f5aaac61..239757e4f 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -182,7 +182,7 @@ unsigned long strlcpy(char*, const char*, unsigned long);
 
 // tdm
 #cmakedefine XBINDIR "@XBINDIR@"
-#define KDE_BINDIR "@TDE_BIN_DIR@"
+#define TDE_BINDIR "@TDE_BIN_DIR@"
 #define KDE_DATADIR "@TDE_DATA_DIR@"
 #define KDE_CONFDIR "@TDE_CONFIG_DIR@"
 
diff --git a/configure.in.in b/configure.in.in
index 305760d09..831a60cfb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -229,9 +229,9 @@ KDE_EXPAND_MAKEVAR(KDE_CONFDIR, kde_confdir)
 AC_DEFINE_UNQUOTED(KDE_CONFDIR, "$KDE_CONFDIR", [KDE's configuration directory])
 KDE_EXPAND_MAKEVAR(KDE_DATADIR, kde_datadir)
 AC_DEFINE_UNQUOTED(KDE_DATADIR, "$KDE_DATADIR", [KDE's static data directory])
-KDE_EXPAND_MAKEVAR(KDE_BINDIR, kde_bindir)
-AC_DEFINE_UNQUOTED(KDE_BINDIR, "$KDE_BINDIR", [KDE's binaries directory])
-AC_SUBST(KDE_BINDIR)
+KDE_EXPAND_MAKEVAR(TDE_BINDIR, kde_bindir)
+AC_DEFINE_UNQUOTED(TDE_BINDIR, "$TDE_BINDIR", [TDE's binaries directory])
+AC_SUBST(TDE_BINDIR)
 
 dnl libart is used by tdm, kcontrol and thumbnails code in tdeioslaves
 KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
diff --git a/kcontrol/tdm/tdm-appear.cpp b/kcontrol/tdm/tdm-appear.cpp
index c057867d1..9ad28eacf 100644
--- a/kcontrol/tdm/tdm-appear.cpp
+++ b/kcontrol/tdm/tdm-appear.cpp
@@ -252,7 +252,7 @@ TDMAppearanceWidget::TDMAppearanceWidget(TQWidget *parent, const char *name)
   hbox2->setColStretch(1, 1);
   hbox2->addWidget(sakbox, 1, 0);
   if (getuid() == 0 && config->checkConfigFilesWritable( true )) {
-    if (system(KDE_BINDIR "/tsak checkdeps") != 0) {
+    if (system(TDE_BINDIR "/tsak checkdeps") != 0) {
       sakbox->setEnabled(false);
       sakwarning = new TQLabel( i18n("Secure Attention Key support is not available on your system.  Please check for the presence of evdev and uinput."), group );
       hbox2->addWidget(sakwarning, 2, 0);
@@ -494,7 +494,7 @@ void TDMAppearanceWidget::save()
 
   // Enable/disable tsak as needed
   if (sakbox->isChecked()) {
-    system(KDE_BINDIR "/tsak");
+    system(TDE_BINDIR "/tsak");
   }
   else {
     // Get PID
diff --git a/tdm/backend/session.c b/tdm/backend/session.c
index 0bcd92d5f..060a20b5f 100644
--- a/tdm/backend/session.c
+++ b/tdm/backend/session.c
@@ -585,7 +585,7 @@ ManageSession( struct display *d )
   start_tsak = d->useSAK;
 #endif
   if (start_tsak) {
-		if (system(KDE_BINDIR "/tsak checkdeps") != 0) {
+		if (system(TDE_BINDIR "/tsak checkdeps") != 0) {
 			start_tsak = 0;
 		}
 	}
@@ -593,7 +593,7 @@ ManageSession( struct display *d )
 		int ret_pid = fork();
 		if (ret_pid == 0) {
 			// Child process
-			system(KDE_BINDIR "/tsak");
+			system(TDE_BINDIR "/tsak");
 			exit(0);
 		}
 	}
diff --git a/tdm/config.def b/tdm/config.def
index 43de11c71..0a82c0c34 100644
--- a/tdm/config.def
+++ b/tdm/config.def
@@ -2645,7 +2645,7 @@ Key: Preloader
 Type: string
 Default: ""
 User: greeter-c
-Instance: */KDE_BINDIR "/preloadkde"
+Instance: */TDE_BINDIR "/preloadkde"
 Comment: &
 Description:
  A program to run while the greeter is visible. It is supposed to preload
diff --git a/tdmlib/tdmtsak.h b/tdmlib/tdmtsak.h
index 34a1953c3..c1bd76ecf 100644
--- a/tdmlib/tdmtsak.h
+++ b/tdmlib/tdmtsak.h
@@ -63,7 +63,7 @@ inline int tde_sak_verify_calling_process()
 	printf("Parent executable name and full path is: %s\n", procparent.ascii());
 #endif
 
-	TQString tdeBinaryPath = TQString(KDE_BINDIR "/");
+	TQString tdeBinaryPath = TQString(TDE_BINDIR "/");
 #ifdef DEBUG
 	printf("The TDE binary path is: %s\n", tdeBinaryPath.ascii());
 #endif
@@ -121,7 +121,7 @@ inline int tde_sak_verify_calling_process()
 			printf("Environment is: %s\n", tdeinitEnvironment.ascii());
 #endif
 
-			if ((tdeinitCommand == "kdesktop [tdeinit]") && (tdeinitEnvironment.startsWith(KDE_BINDIR))) {
+			if ((tdeinitCommand == "kdesktop [tdeinit]") && (tdeinitEnvironment.startsWith(TDE_BINDIR))) {
 				authorized = true;
 			}
 			else {