Index: tools/dev/mk_language_shell.pl
===================================================================
--- tools/dev/mk_language_shell.pl	(.../trunk)	(revision 37831)
+++ tools/dev/mk_language_shell.pl	(.../branches/dir_simplify)	(revision 37832)
@@ -490,8 +490,8 @@
 
 ## configuration settings
 VERSION       := @versiondir@
-BIN_DIR       := @bin_dir@
-LIB_DIR       := @lib_dir@$(VERSION)
+BIN_DIR       := @bindir@
+LIB_DIR       := @libdir@$(VERSION)
 DOC_DIR       := @doc_dir@$(VERSION)
 MANDIR        := @mandir@$(VERSION)
 
Index: config/init/install.pm
===================================================================
--- config/init/install.pm	(.../trunk)	(revision 37831)
+++ config/init/install.pm	(.../branches/dir_simplify)	(revision 37832)
@@ -90,7 +90,6 @@
     $conf->data->set(
         prefix         => $prefix,
         exec_prefix    => $eprefix,
-        bin_dir        => $bindir,           # deprecated
         bindir         => $bindir,
         sbindir        => $sbindir,
         libexecdir     => $libexecdir,
@@ -99,9 +98,7 @@
         sharedstatedir => $sharedstatedir,
         localstatedir  => $localstatedir,
         libdir         => $libdir,
-        lib_dir        => $libdir,           # deprecated
         includedir     => $includedir,
-        include_dir    => $includedir,       # deprecated
         oldincludedir  => $oldincludedir,
         infodir        => $infodir,
         mandir         => $mandir,