diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rwxr-xr-x | bootstrap (renamed from bootstrap.1) | 1 | ||||
-rw-r--r-- | configure.in | 1 | ||||
-rwxr-xr-x | set_soenv.in | 17 |
4 files changed, 1 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index 8c0f62aa0655..57cd3629cb24 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,6 @@ /aclocal.m4 /autom4te.cache /autogen.lastrun -/bootstrap /ChangeLog /config.guess /config.log diff --git a/bootstrap.1 b/bootstrap index 933b2db7e71c..1bf5068f02b7 100755 --- a/bootstrap.1 +++ b/bootstrap @@ -1,3 +1,4 @@ +#!/bin/sh if test -z "${SOLARENV}"; then if test -f ./Env.Build.sh ; then diff --git a/configure.in b/configure.in index d9d28ff4bb28..f89089c30933 100644 --- a/configure.in +++ b/configure.in @@ -2109,7 +2109,6 @@ if test "$cross_compiling" = "yes"; then tar cf - \ Makefile.in \ bin/repo-list.in \ - bootstrap.1 \ config.guess \ configure \ ooo.lst.in \ diff --git a/set_soenv.in b/set_soenv.in index 63223e76ff38..310ac75120f1 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -2118,23 +2118,6 @@ Alternatively, you can install the 'new' make where ever you want and make sure EOS } -$bootfile = "bootstrap"; -open( OUT, ">$bootfile" ) || -die "Cannot open $bootfile: $!\n"; -print OUT "#!/bin/sh\n"; -close( OUT ) || print "Can't close $bootfile: $!"; -system(`cat bootstrap.1 >> bootstrap`); -system(`chmod +x bootstrap`); -# -#-------------------------------------------------------- -# Moving the bootstrap file to the build home directory. -#-------------------------------------------------------- -# -$tmp = $SRC_ROOT.$ds.$bootfile; -if (rename( $bootfile, $tmp ) ne 1) -{ `mv -f $bootfile $tmp`; -} - if ( $Warning ne "" ) { print "***** WARNINGS ISSUED *****\n"; } |