Revert "gcj: added some bashism, cleaned up"

This reverts commit d075dca0e060c0bf49716dc4b4269b3e8c4a0063.

5 files changed, 25 insertions, 27 deletions

diff --git a/gnu/gcj/BUILD b/gnu/gcj/BUILD
index 8f314798f8..1af3ceda07 100755
--- a/gnu/gcj/BUILD
+++ b/gnu/gcj/BUILD
@@ -6,13 +6,13 @@ persistent_read  gcc  GCC_CFLAGS   CFLAGS   &&
 persistent_read  gcc  GCC_LDFLAGS  LDFLAGS  &&
 
 # when updating this spell please check if this is still necessary:
-if [[ $GCJ_AWT == y ]]; then
-  CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/freetype2"
-fi &&
+if [ "$GCJ_AWT" = "y" ]; then
+	CFLAGS="$CFLAGS -I${INSTALL_ROOT}/usr/include/freetype2"
+fi                                                         &&
 
-if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
+if  [[  "${SMGL_COMPAT_ARCHS[1]}"  ==  "x86_64"  ]];  then
   OPTS="--build=x86_64-pc-linux-gnu  $OPTS"
-fi &&
+fi  &&
 
 sedit "s/lib64/lib/" gcc/config/i386/linux64.h             &&
 
diff --git a/gnu/gcj/DEPENDS b/gnu/gcj/DEPENDS
index d1211a1c4c..a8f12d488b 100755
--- a/gnu/gcj/DEPENDS
+++ b/gnu/gcj/DEPENDS
@@ -1,7 +1,7 @@
 . $GRIMOIRE/libcompat  &&
 depends  gcc           &&
 
-if [[ $GCJ_AWT == y ]]; then
+if [ "$GCJ_AWT" = "y" ]; then
   depends  gtk+2 '--enable-java-awt=gtk'  &&
   depends  libart_lgpl                    &&
   . $GRIMOIRE/FUNCTIONS                   &&
@@ -10,8 +10,8 @@ if [[ $GCJ_AWT == y ]]; then
   fi
 fi  &&
 
-if [[ $VERSION != $(installed_version gcc) ]]; then
-  force_depends gcc
+if  [[  $VERSION != $(installed_version gcc) ]]; then
+  force_depends  gcc
 fi &&
 
 depends  gmp             &&
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index 8d43208b56..ff8238d119 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,9 +1,7 @@
 2008-06-14 Vlad Glagolev <stealth@sourcemage.org>
-	* BUILD, DEPENDS: a bit more bashismization
 	* DETAILS: added Eclipse compiler for Java (jar file, needed since 4.3)
 	* PRE_BUILD: move ECJ jar file into source tree, libjava conf will take
-	  care about it, added missing `&&', cleaned up, add a bit more bashism
-	* INSTALL: fixed multijob build, $SPELL > $SCRIPT, `install' > `cp'
+	* INSTALL: fixed multijob build
 	* specs_java: renewed specs for Java (from lang-specs.h)
 
 2008-06-11 Ladislav Hagara <hgr@vabo.cz>
@@ -116,3 +114,4 @@
 	* BUILD, DETAILS, FINAL, HISTORY, INSTALL, POST_REMOVE, PRE_BUILD,
 	  SOLO, specs_java:
 	  new spell for the GNU java compiler and library
+
diff --git a/gnu/gcj/INSTALL b/gnu/gcj/INSTALL
index f66edaf05f..7f5e3840b6 100755
--- a/gnu/gcj/INSTALL
+++ b/gnu/gcj/INSTALL
@@ -3,13 +3,14 @@
 #
 cd  $SOURCE_DIRECTORY.bld  &&
 
-make_single  &&
+make_single &&
 make -C gcc java.install-common java.install-man  &&
-install -c gcc/jc1       ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION  &&
-install -c gcc/jvgenmain ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION  &&
-make -C $HOST/libjava install  &&
-make_normal  &&
+install -c gcc/jc1       ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/  &&
+install -c gcc/jvgenmain ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/  &&
+make -C $HOST/libjava/ install  &&
+make_normal &&
 
 # specs file stuff
 local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION  &&
-install $SPELL_DIRECTORY/specs_java $SPECSDIR/specs-local
+mkdir -p $SPECSDIR/specs-local                             &&
+cp $SCRIPT_DIRECTORY/specs_java $SPECSDIR/specs-local
diff --git a/gnu/gcj/PRE_BUILD b/gnu/gcj/PRE_BUILD
index 63a4b875fb..bf17ee73a5 100755
--- a/gnu/gcj/PRE_BUILD
+++ b/gnu/gcj/PRE_BUILD
@@ -1,16 +1,14 @@
-if [[ $(installed_version gcc) != $VERSION ]]; then
+if [ "$(installed_version gcc)" != "$VERSION" ]; then
   message "${PROBLEM_COLOR}Installed version of gcc is $(installed_version gcc), not $VERSION!"
   message "Update gcc first.${DEFAULT_COLOR}"
   return 1;
-fi &&
-
-default_pre_build &&
-cd $BUILD_DIRECTORY &&
-
-unpack_file 2 &&
-unpack_file 3 &&
-verify_file 7 &&
+fi
+default_pre_build                &&
+cd $BUILD_DIRECTORY              &&
+unpack_file 2                    &&
+unpack_file 3                    &&
+verify_file 7                    &&
 
 cp -v $SOURCE_CACHE/$SOURCE7 $SOURCE_DIRECTORY/ecj.jar &&
 
-mk_source_dir $SOURCE_DIRECTORY.bld
+mk_source_dir  $SOURCE_DIRECTORY.bld