Update various 'sh boot's to 'perl boot'

Spotted by Marco Túlio Gontijo e Silva

diff --git a/MAKEHELP b/MAKEHELP
index e0f2db4..85497e9 100644 (file)
--- a/MAKEHELP
+++ b/MAKEHELP
@@ -50,6 +50,6 @@ Common commands:
 
      Various levels of cleaning: "clean" restores the tree to the
      state after "./configure", "distclean" restores to the state
 
      Various levels of cleaning: "clean" restores the tree to the
      state after "./configure", "distclean" restores to the state

-     after "sh boot", and maintainer-clean restores the tree to the
+     after "perl boot", and maintainer-clean restores the tree to the

      completely clean checked-out state.
 
      completely clean checked-out state.
 

diff --git a/README b/README
index d36c642..72a9609 100644 (file)
--- a/README
+++ b/README
@@ -80,12 +80,12 @@ dblatex.
 
 Quick start:  the following gives you a default build:
 
 
 Quick start:  the following gives you a default build:
 

-    $ sh boot
+    $ perl boot

     $ ./configure
     $ make
     $ make install
 
     $ ./configure
     $ make
     $ make install
 

-The "sh boot" step is only necessary if this is a tree checked out
+The "perl boot" step is only necessary if this is a tree checked out

 from darcs.  For source distributions downloaded from GHC's web site,
 this step has already been performed.
 
 from darcs.  For source distributions downloaded from GHC's web site,
 this step has already been performed.
 

diff --git a/configure.ac b/configure.ac
index 51b04d6..d2386d1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_INIT([The Glorious Glasgow Haskell Compilation System], [6.13], [glasgow-hask
 # when the source distribution was created.
 
 if test ! -f mk/config.h.in; then
 # when the source distribution was created.
 
 if test ! -f mk/config.h.in; then

-   echo "mk/config.h.in doesn't exist: perhaps you haven't run 'sh boot'?"
+   echo "mk/config.h.in doesn't exist: perhaps you haven't run 'perl boot'?"

    exit 1
 fi
 
    exit 1
 fi
 

diff --git a/distrib/MacOS/GHC.xcodeproj/project.pbxproj b/distrib/MacOS/GHC.xcodeproj/project.pbxproj
index 7b37dbd..4445ee5 100644 (file)
--- a/distrib/MacOS/GHC.xcodeproj/project.pbxproj
+++ b/distrib/MacOS/GHC.xcodeproj/project.pbxproj
@@ -74,7 +74,7 @@
                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );

-                       comments = "Supported targets: build\n\nPrecondition: Fully compiled tree (i.e., \"sh boot; ./configure; make\" was already executed)\n\nThis project creates a Mac OS X framework that encapsulates a *relocatable* *binary* GHC distribution.\n\n*  The framework is versioned using GHC's ProjectVersionInt. and we call the current version directory in the following CONTENTS_FOLDER_BUILD.\n\n* This target installs into CONTENTS_FOLDER_BUILD/ghc/ the same contents that is in a binary-dist tar ball.\n\n* The idea is that at framework installation time, a post install script will perform \n\n    ./configure --prefix=CONTENTS_FOLDER_INSTALL/usr; make install \n\n   in that ghc/ directory, where CONTENTS_FOLDER_INSTALL is the path that CONTENTS_FOLDER_BUILD has after the package containing the framework was installed by the package installer.  This effectively rellocates the ghc installation to its final destination.";
+                       comments = "Supported targets: build\n\nPrecondition: Fully compiled tree (i.e., \"perl boot; ./configure; make\" was already executed)\n\nThis project creates a Mac OS X framework that encapsulates a *relocatable* *binary* GHC distribution.\n\n*  The framework is versioned using GHC's ProjectVersionInt. and we call the current version directory in the following CONTENTS_FOLDER_BUILD.\n\n* This target installs into CONTENTS_FOLDER_BUILD/ghc/ the same contents that is in a binary-dist tar ball.\n\n* The idea is that at framework installation time, a post install script will perform \n\n    ./configure --prefix=CONTENTS_FOLDER_INSTALL/usr; make install \n\n   in that ghc/ directory, where CONTENTS_FOLDER_INSTALL is the path that CONTENTS_FOLDER_BUILD has after the package containing the framework was installed by the package installer.  This effectively rellocates the ghc installation to its final destination.";

                        dependencies = (
                        );
                        name = "GHC-relocatable";
                        dependencies = (
                        );
                        name = "GHC-relocatable";

@@ -92,7 +92,7 @@
                        );
                        buildRules = (
                        );
                        );
                        buildRules = (
                        );

-                       comments = "Supported targets: build, install\n\nPrecondition: We are in a distribution tree, not a vanilla tree from darcs - i.e., \"sh boot; ./configure\" was already executed.\n\nAs part of the build target, ./configure will be executed again (setting a --prefix).  Additional arguments to ./configure can be specified by way of the environment variable XCODE_EXTRA_CONFIGURE_ARGS.\n\nThis project creates a Mac OS X framework at /Library/Frameworks.\n\n*  The framework is versioned using GHC's ProjectVersionInt.\n\n* The target configures the tree for the deployment location and builds the tree.\n\n* This target installs the framework not into its final destination, but into a build directory using the DESTDIR feature of GHC build system (unless the deployment flag in the build rules is set).\n\n* The idea is that the framework at the build location is being turned into a package and the package installer eventually puts its at its final destination. \n";
+                       comments = "Supported targets: build, install\n\nPrecondition: We are in a distribution tree, not a vanilla tree from darcs - i.e., \"perl boot; ./configure\" was already executed.\n\nAs part of the build target, ./configure will be executed again (setting a --prefix).  Additional arguments to ./configure can be specified by way of the environment variable XCODE_EXTRA_CONFIGURE_ARGS.\n\nThis project creates a Mac OS X framework at /Library/Frameworks.\n\n*  The framework is versioned using GHC's ProjectVersionInt.\n\n* The target configures the tree for the deployment location and builds the tree.\n\n* This target installs the framework not into its final destination, but into a build directory using the DESTDIR feature of GHC build system (unless the deployment flag in the build rules is set).\n\n* The idea is that the framework at the build location is being turned into a package and the package installer eventually puts its at its final destination. \n";

                        dependencies = (
                        );
                        name = "GHC-systemwide";
                        dependencies = (
                        );
                        name = "GHC-systemwide";

diff --git a/ghc.mk b/ghc.mk
index 159f15e..4640b7f 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -43,7 +43,7 @@
 #     then we don't have to use -osuf/-hisuf.  We would have to install
 #     them in different places too, so we'd need ghc-pkg support for packages
 #     of different ways.
 #     then we don't have to use -osuf/-hisuf.  We would have to install
 #     them in different places too, so we'd need ghc-pkg support for packages
 #     of different ways.

-#   * make PACKAGES generated by configure or sh boot?
+#   * make PACKAGES generated by './configure' or 'perl boot'?

 #   * we should use a directory of package.conf files rather than a single
 #     file for the inplace package database, so that we can express
 #     dependencies more accurately.  Otherwise it's possible to get into
 #   * we should use a directory of package.conf files rather than a single
 #     file for the inplace package database, so that we can express
 #     dependencies more accurately.  Otherwise it's possible to get into

diff --git a/ghc.spec.in b/ghc.spec.in
index 3400227..c8eab26 100644 (file)
--- a/ghc.spec.in
+++ b/ghc.spec.in
@@ -85,7 +85,7 @@ needed.
 %setup -b1
 
 %build
 %setup -b1
 
 %build

-test -f configure || sh boot
+test -f configure || perl boot

 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
 
 # Don't install these tools, we'll use update-alternatives below.
 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
 
 # Don't install these tools, we'll use update-alternatives below.