[svn:parrot] r38335 - in branches/install_tools: config/gen/makefiles config/init docs/pdds/draft examples/languages/squaak/config/makefiles ext/SQLite3 tools/dev

jkeenan at svn.parrot.org jkeenan at svn.parrot.org
Sat Apr 25 03:30:28 UTC 2009


Author: jkeenan
Date: Sat Apr 25 03:30:24 2009
New Revision: 38335
URL: https://trac.parrot.org/parrot/changeset/38335

Log:
Convert doc_dir to docdir throughout.

Modified:
   branches/install_tools/config/gen/makefiles/root.in
   branches/install_tools/config/init/install.pm
   branches/install_tools/docs/pdds/draft/pdd30_install.pod
   branches/install_tools/examples/languages/squaak/config/makefiles/root.in
   branches/install_tools/ext/SQLite3/Makefile.in
   branches/install_tools/tools/dev/mk_language_shell.pl

Modified: branches/install_tools/config/gen/makefiles/root.in
==============================================================================
--- branches/install_tools/config/gen/makefiles/root.in	Fri Apr 24 22:48:51 2009	(r38334)
+++ branches/install_tools/config/gen/makefiles/root.in	Sat Apr 25 03:30:24 2009	(r38335)
@@ -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/install_tools/config/init/install.pm
==============================================================================
--- branches/install_tools/config/init/install.pm	Fri Apr 24 22:48:51 2009	(r38334)
+++ branches/install_tools/config/init/install.pm	Sat Apr 25 03:30:24 2009	(r38335)
@@ -108,7 +108,7 @@
         srcdir         => $srcdir,
 
         # parrot internal use only
-        doc_dir        => $datadir . "/doc",
+        docdir        => $datadir . "/doc",
         versiondir     => $versiondir,
     );
 

Modified: branches/install_tools/docs/pdds/draft/pdd30_install.pod
==============================================================================
--- branches/install_tools/docs/pdds/draft/pdd30_install.pod	Fri Apr 24 22:48:51 2009	(r38334)
+++ branches/install_tools/docs/pdds/draft/pdd30_install.pod	Sat Apr 25 03:30:24 2009	(r38335)
@@ -206,8 +206,8 @@
 destination directory's F<lib> directory under F<parrot/include/> I<(not
 yet)>.
 
-=item * doc_dir: Copy documentation files to a
-F<$doc_dir/languages/mylanguage/> subdirectory tree.
+=item * docdir: Copy documentation files to a
+F<$docdir/languages/mylanguage/> subdirectory tree.
 
 =item * man_dir: Generate man(1) pages and copy to destination directory's
 F<$man_dir/man1/> directory. {{ what about man(2) and man(3) pages? info_dir

Modified: branches/install_tools/examples/languages/squaak/config/makefiles/root.in
==============================================================================
--- branches/install_tools/examples/languages/squaak/config/makefiles/root.in	Fri Apr 24 22:48:51 2009	(r38334)
+++ branches/install_tools/examples/languages/squaak/config/makefiles/root.in	Sat Apr 25 03:30:24 2009	(r38335)
@@ -6,9 +6,9 @@
 
 ## configuration settings
 VERSION       := @versiondir@
-BIN_DIR       := @bin_dir@
-LIB_DIR       := @lib_dir@$(VERSION)
-DOC_DIR       := @doc_dir@$(VERSION)
+BIN_DIR       := @bindir@
+LIB_DIR       := @libdir@$(VERSION)
+DOC_DIR       := @docdir@$(VERSION)
 MANDIR        := @mandir@$(VERSION)
 
 # Set up extensions

Modified: branches/install_tools/ext/SQLite3/Makefile.in
==============================================================================
--- branches/install_tools/ext/SQLite3/Makefile.in	Fri Apr 24 22:48:51 2009	(r38334)
+++ branches/install_tools/ext/SQLite3/Makefile.in	Sat Apr 25 03:30:24 2009	(r38335)
@@ -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/install_tools/tools/dev/mk_language_shell.pl
==============================================================================
--- branches/install_tools/tools/dev/mk_language_shell.pl	Fri Apr 24 22:48:51 2009	(r38334)
+++ branches/install_tools/tools/dev/mk_language_shell.pl	Sat Apr 25 03:30:24 2009	(r38335)
@@ -457,9 +457,9 @@
 
 ## configuration settings
 VERSION       := @versiondir@
-BIN_DIR       := @bin_dir@
-LIB_DIR       := @lib_dir@$(VERSION)
-DOC_DIR       := @doc_dir@$(VERSION)
+BIN_DIR       := @bindir@
+LIB_DIR       := @libdir@$(VERSION)
+DOC_DIR       := @docdir@$(VERSION)
 MANDIR        := @mandir@$(VERSION)
 
 # Set up extensions


More information about the parrot-commits mailing list