* Makefile.am: Rename LIBDIR to DATADIR, since it refers to

pkgdatadir now.  Install cons.saver to pkglibdir, pass it to the
compiler as LIBDIR.
* cons.handler.c (handle_console): Use LIBDIR.
* main.c (OS_Setup): Use DATADIR instead of LIBDIR.  Rename
MC_LIBDIR to MC_DATADIR.

src/ChangeLog

@@ -1,5 +1,12 @@
 2002-09-21  Pavel Roskin  <proski@gnu.org>
 
+	* Makefile.am: Rename LIBDIR to DATADIR, since it refers to
+	pkgdatadir now.  Install cons.saver to pkglibdir, pass it to the
+	compiler as LIBDIR.
+	* cons.handler.c (handle_console): Use LIBDIR.
+	* main.c (OS_Setup): Use DATADIR instead of LIBDIR.  Rename
+	MC_LIBDIR to MC_DATADIR.
+
 	* panelize,c: Remove unused variable panelize_title.
 
 	* view.c (view_event): Add mouse wheel support.

src/Makefile.am

@@ -1,13 +1,15 @@
 AM_CFLAGS = $(GLIB_CFLAGS)
-AM_CPPFLAGS = -DLIBDIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
 
-suppbindir = $(pkglibdir)/bin
 localedir = $(datadir)/locale
 
 bin_PROGRAMS = mc mcmfmt
 
 if CONS_SAVER
-suppbin_PROGRAMS = cons.saver
+pkglib_PROGRAMS = cons.saver
+AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\" \
+	-DLIBDIR=\""$(pkglibdir)"\"
+else
+AM_CPPFLAGS = -DDATADIR=\""$(pkgdatadir)/"\" -DLOCALEDIR=\""$(localedir)"\"
 endif
 
 noinst_PROGRAMS = man2hlp

src/cons.handler.c

@@ -144,7 +144,7 @@ void handle_console (unsigned char action)
 	    open ("/dev/null", O_WRONLY);
 	    if (tty_name) {
 		/* Exec the console save/restore handler */
-		mc_conssaver = concat_dir_and_file (mc_home, "bin/cons.saver");
+		mc_conssaver = concat_dir_and_file (LIBDIR, "cons.saver");
 		execl (mc_conssaver, "cons.saver", tty_name, NULL);
 	    }
 	    /* Console is not a tty or execl() failed */

src/main.c

@@ -1997,12 +1997,12 @@ OS_Setup (void)
     if (!shell || !*shell)
 	shell = "/bin/sh";
 
-    /* This is the directory, where MC was installed, on Unix this is LIBDIR */
+    /* This is the directory, where MC was installed, on Unix this is DATADIR */
-    /* and can be overriden by the MC_LIBDIR environment variable */
+    /* and can be overriden by the MC_DATADIR environment variable */
-    if ((mc_libdir = getenv ("MC_LIBDIR")) != NULL) {
+    if ((mc_libdir = getenv ("MC_DATADIR")) != NULL) {
 	mc_home = g_strdup (mc_libdir);
     } else {
-	mc_home = g_strdup (LIBDIR);
+	mc_home = g_strdup (DATADIR);
     }
 }