[svn:parrot] r37861 - in trunk: config/init tools/dev

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Thu Apr  2 01:22:17 2009
New Revision: 37861
URL: https://trac.parrot.org/parrot/changeset/37861

Log:
Merge dir_simplify branch into trunk.  This eliminates 3 long-deprecated configure attributes as per https://trac.parrot.org/parrot/ticket/524.

Modified:
   trunk/config/init/install.pm
   trunk/tools/dev/mk_language_shell.pl

Modified: trunk/config/init/install.pm
==============================================================================
--- trunk/config/init/install.pm	Thu Apr  2 00:51:24 2009	(r37860)
+++ trunk/config/init/install.pm	Thu Apr  2 01:22:17 2009	(r37861)
@@ -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,

Modified: trunk/tools/dev/mk_language_shell.pl
==============================================================================
--- trunk/tools/dev/mk_language_shell.pl	Thu Apr  2 00:51:24 2009	(r37860)
+++ trunk/tools/dev/mk_language_shell.pl	Thu Apr  2 01:22:17 2009	(r37861)
@@ -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)