[svn:parrot] r39158 - in branches/better_install_tools: config/gen/makefiles config/init examples/languages/abc/config/makefiles examples/languages/squaak/config/makefiles examples/pir/befunge/config/makefiles ext/SQLite3 tools/dev

[jkeenan at svn.parrot.org]

Author: jkeenan
Date: Sun May 24 17:11:53 2009
New Revision: 39158
URL: https://trac.parrot.org/parrot/changeset/39158

Log:
Standardize on 'dir' rather than '_dir' in, e.g., 'doc_dir'.  (Exception:  build_dir).

Modified:
   branches/better_install_tools/config/gen/makefiles/root.in
   branches/better_install_tools/config/init/install.pm
   branches/better_install_tools/examples/languages/abc/config/makefiles/root.in
   branches/better_install_tools/examples/languages/squaak/config/makefiles/root.in
   branches/better_install_tools/examples/pir/befunge/config/makefiles/root.in
   branches/better_install_tools/ext/SQLite3/Makefile.in
   branches/better_install_tools/tools/dev/mk_language_shell.pl

Modified: branches/better_install_tools/config/gen/makefiles/root.in
==============================================================================
--- branches/better_install_tools/config/gen/makefiles/root.in	Sun May 24 17:09:25 2009	(r39157)
+++ branches/better_install_tools/config/gen/makefiles/root.in	Sun May 24 17:11:53 2009	(r39158)
@@ -32,7 +32,7 @@
 LIB_DIR         := @libdir@
 INCLUDE_DIR     := @includedir@
 DATA_DIR        := @datadir@
-DOC_DIR         := @doc_dir@
+DOC_DIR         := @docdir@
 VERSION_DIR     = @versiondir@
 
 

Modified: branches/better_install_tools/config/init/install.pm
==============================================================================
--- branches/better_install_tools/config/init/install.pm	Sun May 24 17:09:25 2009	(r39157)
+++ branches/better_install_tools/config/init/install.pm	Sun May 24 17:11:53 2009	(r39158)
@@ -105,7 +105,7 @@
         srcdir         => $srcdir,
 
         # parrot internal use only
-        doc_dir        => $datadir . "/doc",
+        docdir         => $datadir . "/doc",
         versiondir     => $versiondir,
     );
 

Modified: branches/better_install_tools/examples/languages/abc/config/makefiles/root.in
==============================================================================
--- branches/better_install_tools/examples/languages/abc/config/makefiles/root.in	Sun May 24 17:09:25 2009	(r39157)
+++ branches/better_install_tools/examples/languages/abc/config/makefiles/root.in	Sun May 24 17:11:53 2009	(r39158)
@@ -8,7 +8,7 @@
 VERSION       := @versiondir@
 BIN_DIR       := @bindir@
 LIB_DIR       := @libdir@$(VERSION)
-DOC_DIR       := @doc_dir@$(VERSION)
+DOC_DIR       := @docdir@$(VERSION)
 MANDIR        := @mandir@$(VERSION)
 
 # Set up extensions

Modified: branches/better_install_tools/examples/languages/squaak/config/makefiles/root.in
==============================================================================
--- branches/better_install_tools/examples/languages/squaak/config/makefiles/root.in	Sun May 24 17:09:25 2009	(r39157)
+++ branches/better_install_tools/examples/languages/squaak/config/makefiles/root.in	Sun May 24 17:11:53 2009	(r39158)
@@ -8,7 +8,7 @@
 VERSION       := @versiondir@
 BIN_DIR       := @bindir@
 LIB_DIR       := @libdir@$(VERSION)
-DOC_DIR       := @doc_dir@$(VERSION)
+DOC_DIR       := @docdir@$(VERSION)
 MANDIR        := @mandir@$(VERSION)
 
 # Set up extensions

Modified: branches/better_install_tools/examples/pir/befunge/config/makefiles/root.in
==============================================================================
--- branches/better_install_tools/examples/pir/befunge/config/makefiles/root.in	Sun May 24 17:09:25 2009	(r39157)
+++ branches/better_install_tools/examples/pir/befunge/config/makefiles/root.in	Sun May 24 17:11:53 2009	(r39158)
@@ -8,7 +8,7 @@
 VERSION       := @versiondir@
 BIN_DIR       := @bindir@
 LIB_DIR       := @libdir@$(VERSION)
-DOC_DIR       := @doc_dir@$(VERSION)
+DOC_DIR       := @docdir@$(VERSION)
 MANDIR        := @mandir@$(VERSION)
 
 # Set up extensions

Modified: branches/better_install_tools/ext/SQLite3/Makefile.in
==============================================================================
--- branches/better_install_tools/ext/SQLite3/Makefile.in	Sun May 24 17:09:25 2009	(r39157)
+++ branches/better_install_tools/ext/SQLite3/Makefile.in	Sun May 24 17:11:53 2009	(r39158)
@@ -10,10 +10,10 @@
 PREFIX          = @prefix@
 EXEC_PREFIX     = @exec_prefix@
 DESTDIR         =
-BIN_DIR         = @bin_dir@
-LIB_DIR         = @lib_dir@
-INCLUDE_DIR     = @include_dir@
-DOC_DIR         = @doc_dir@
+BIN_DIR         = @bindir@
+LIB_DIR         = @libdir@
+INCLUDE_DIR     = @includedir@
+DOC_DIR         = @docdir@
 INC_DIR         = @inc@
 RM_F             = @rm_f@
 RM_RF            = @rm_rf@

Modified: branches/better_install_tools/tools/dev/mk_language_shell.pl
==============================================================================
--- branches/better_install_tools/tools/dev/mk_language_shell.pl	Sun May 24 17:09:25 2009	(r39157)
+++ branches/better_install_tools/tools/dev/mk_language_shell.pl	Sun May 24 17:11:53 2009	(r39158)
@@ -492,7 +492,7 @@
 VERSION       := @versiondir@
 BIN_DIR       := @bindir@
 LIB_DIR       := @libdir@$(VERSION)
-DOC_DIR       := @doc_dir@$(VERSION)
+DOC_DIR       := @docdir@$(VERSION)
 MANDIR        := @mandir@$(VERSION)
 
 # Set up extensions