[JAVA] /bin/sh portability issues in classpath/lib/Makefile.in

[JAVA] /bin/sh portability issues in classpath/lib/Makefile.in

[Roger Sayle]

This is the second installment in a series of fixes to allow libjava
to be built using Solaris' /bin/sh.  This time the use of the idiom
"if ! [ -e subdir ] ; then ..." makes the native shell unhappy, and is
replaced in the patch below with the more portable equivalent of
"if test ! -d subdir ; then ...".

Tested on i386-pc-solaris2.10, where a top-level "make boostrap" gets
further with this change than without it.



2006-07-06  Roger Sayle  <roger@eyesopen.com>

	* lib/Makefile.am (resources): Fix some shell portability issues.


Index: lib/Makefile.am
===================================================================
*** lib/Makefile.am	(revision 115223)
--- lib/Makefile.am	(working copy)
*************** glibj.zip: classes compile-classes resou
*** 105,116 ****
  endif # USE_PREBUILT_GLIBJ_ZIP

  resources: copy-vmresources.sh
! 	if ! [ -e gnu ]; then mkdir gnu; fi
! 	if ! [ -e gnu/java ]; then mkdir gnu/java; fi
! 	if ! [ -e gnu/java/locale ]; then mkdir gnu/java/locale; fi
! 	if ! [ -e gnu/javax/swing/plaf/gtk/icons ]; then mkdir -p gnu/javax/swing/plaf/gtk/icons; fi
  	list='$(propertydirs)'; for p in $$list; do \
! 	  if ! [ -e $$p ]; then mkdir $$p; fi; \
  	done
  	list='$(propertyfiles)'; for p in $$list; do \
  	  cp -f $(top_srcdir)/resource/$$p $$p; \
--- 105,116 ----
  endif # USE_PREBUILT_GLIBJ_ZIP

  resources: copy-vmresources.sh
! 	if test ! -d gnu ; then mkdir gnu; fi
! 	if test ! -d gnu/java ; then mkdir gnu/java; fi
! 	if test ! -d gnu/java/locale ; then mkdir gnu/java/locale; fi
! 	if test ! -d gnu/javax/swing/plaf/gtk/icons ; then mkdir -p gnu/javax/swing/plaf/gtk/icons; fi
  	list='$(propertydirs)'; for p in $$list; do \
! 	  if test ! -d $$p ; then mkdir $$p; fi; \
  	done
  	list='$(propertyfiles)'; for p in $$list; do \
  	  cp -f $(top_srcdir)/resource/$$p $$p; \


Roger
--

Re: [JAVA] /bin/sh portability issues in classpath/lib/Makefile.in

[Tom Tromey]

>>>>> "Roger" == Roger Sayle <roger@eyesopen.com> writes:

Roger> This is the second installment in a series of fixes to allow libjava
Roger> to be built using Solaris' /bin/sh.  This time the use of the idiom
Roger> "if ! [ -e subdir ] ; then ..." makes the native shell unhappy, and is
Roger> replaced in the patch below with the more portable equivalent of
Roger> "if test ! -d subdir ; then ...".

I'm (finally) checking this in to Classpath.
Feel free to commit it to libjava; if you prefer, I can do it.

Tom