Nice Makefile,1.153,1.154

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30203

Modified Files:
        Makefile 
Log Message:
Updated the location of ant.jar, and simplified the ant classpath finding code.


Index: Makefile
===================================================================
RCS file: /cvsroot/nice/Nice/Makefile,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** Makefile    20 Sep 2004 11:07:48 -0000      1.153
--- Makefile    7 Oct 2004 09:41:51 -0000       1.154
***************
*** 13,24 ****
  # ANT classpath; we will use NICE_ANTJAR or ANT_HOME (in that order) 
  # if present, otherwise try good default
! ANT_CLASSPATH= ${shell if [ "z${NICE_ANTJAR}" != "z" ] ; \
!       then echo "${NICE_ANTJAR}"; \
!       elif [ "z${ANT_HOME}" != "z" ] ; \
!       then echo "${ANT_HOME}/lib/ant.jar"; \
!       else if [ "z${CLASSPATH}" != "z" ]; \
!               then echo 
"/usr/share/java/ant.jar:./external/ant.jar:${CLASSPATH}"; \
!               else echo "/usr/share/java/ant.jar:./external/ant.jar:"; \
!               fi \
        fi }
  
--- 13,22 ----
  # ANT classpath; we will use NICE_ANTJAR or ANT_HOME (in that order) 
  # if present, otherwise try good default
! ANT_CLASSPATH= ${shell if [ -n "${NICE_ANTJAR}" ] ; \
!               then echo "${NICE_ANTJAR}"; \
!       elif [ -n "${ANT_HOME}" ] ; \
!               then echo "${ANT_HOME}/lib/ant.jar"; \
!       else \
!               echo 
"/usr/share/ant/lib/ant.jar:./external/ant.jar:${CLASSPATH}"; \
        fi }
  



-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl