Ignore:
Timestamp:
Feb 15, 2008, 4:48:37 PM (16 years ago)
Author:
rybkin
Message:

See C.L. 345

File:
1 edited

Legend:

Unmodified
Added
Removed

  • CMT/HEAD/mgr/fragments/java_header

    r401 r441  
    22
    33${CONSTITUENT}javadirs ::
    4         @if test ! -d $(javabin)/${CONSTITUENT} ; then $(mkdir) -p $(javabin)${CONSTITUENT} ; fi
     4        $(silent) if test ! -d $(javabin)/${CONSTITUENT} ; then $(mkdir) -p $(javabin)${CONSTITUENT} ; fi
    55
    66${CONSTITUENT} :: ${CONSTITUENT}javadirs $(javabin)${CONSTITUENT}.jar
    7         @/bin/echo "------> ${CONSTITUENT} ok"
     7        $(echo) "${CONSTITUENT} ok"
    88
    99$(javabin)${CONSTITUENT}.jar :: ${OBJS}
    … …  
    2121
    2222${CONSTITUENT}install :: $(install_dir)/$(${CONSTITUENT}installname)
    23         @if test ! "${CMTINSTALLAREA}" = ""; then\
    24           echo "installation done"; \
    25         fi
     23ifdef CMTINSTALLAREA
     24        $(echo) "installation done"
     25endif
    2626
    2727$(install_dir)/$(${CONSTITUENT}installname) :: $(javabin)$(${CONSTITUENT}installname)
    28         @if test ! "${CMTINSTALLAREA}" = ""; then \
    29           $(cmt_install_action) \
     28ifdef CMTINSTALLAREA
     29        $(install_silent) $(cmt_install_action) \
    3030            -source "$(PACKAGE_ROOT)/classes" \
    3131            -name "$(${CONSTITUENT}installname)" \
    3232            -out "$(install_dir)" \
    3333            -cmd "$(cmt_installarea_command)" \
    34             -cmtpath "$($(package)_cmtpath)" ; \
    35         fi
     34            -cmtpath "$($(package)_cmtpath)"
     35endif
    3636
    3737##${CONSTITUENT}clean :: ${CONSTITUENT}uninstall
    … …  
    4040
    4141${CONSTITUENT}uninstall ::
    42         @if test ! "${CMTINSTALLAREA}" = ""; then \
    43           $(cmt_uninstall_action) \
     42ifdef CMTINSTALLAREA
     43        $(cleanup_silent) $(cmt_uninstall_action) \
    4444            -source "$(PACKAGE_ROOT)/classes" \
    4545            -name "$(${CONSTITUENT}installname)" \
    4646            -out "$(install_dir)" \
    47             -cmtpath "$($(package)_cmtpath)" ; \
    48         fi
     47            -cmtpath "$($(package)_cmtpath)"
     48endif
    4949
    5050${CONSTITUENT}clean ::
    51         /bin/rm -rf $(javabin)/${CONSTITUENT}
    52         /bin/rm -f $(javabin)/${CONSTITUENT}.jar
     51        $(cleanup_silent) /bin/rm -rf $(javabin)/${CONSTITUENT}
     52        $(cleanup_silent) /bin/rm -f $(javabin)/${CONSTITUENT}.jar
    5353
    5454#-- end of java_header ------
Note: See TracChangeset for help on using the changeset viewer.