[BACK]Return to bsd.man.mk CVS log [TXT][DIR] Up to [local] / src / share / mk

Diff for /src/share/mk/bsd.man.mk between version 1.34 and 1.35

version 1.34, 2011/06/24 14:17:41 version 1.35, 2011/06/28 23:50:46
Line 10 
Line 10 
 .MAIN: all  .MAIN: all
 .endif  .endif
   
 .if defined(MANSUBDIR)  # Add / so that we don't have to specify it.
 # Add / so that we don't have to specify it. Better arch -> MANSUBDIR mapping  .if defined(MANSUBDIR) && !empty(MANSUBDIR)
 MANSUBDIR:=${MANSUBDIR:S,^,/,}  MANSUBDIR:=${MANSUBDIR:S,^,/,:S,$,/,}
 .else  .else
 # XXX MANSUBDIR must be non empty for the mlink loops to work  MANSUBDIR=/
 MANSUBDIR=''  
 .endif  .endif
   
 CLEANFILES+= .man-linted  CLEANFILES+= .man-linted
Line 30 
Line 29 
   
 .for page in ${MAN}  .for page in ${MAN}
 .  for sub in ${MANSUBDIR}  .  for sub in ${MANSUBDIR}
 ${DESTDIR}${MANDIR}${page:E}${sub}/${page:T}: ${page}  _MAN_INST=${DESTDIR}${MANDIR}${page:E}${sub}${page:T}
   ${_MAN_INST}: ${page}
         ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \          ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
                 ${.ALLSRC} ${.TARGET}                  ${.ALLSRC} ${.TARGET}
   
 maninstall: ${DESTDIR}${MANDIR}${page:E}${sub}/${page:T}  maninstall: ${_MAN_INST}
 .  endfor  .  endfor
 .endfor  .endfor
   
Line 42 
Line 42 
 .if defined(MLINKS) && !empty(MLINKS)  .if defined(MLINKS) && !empty(MLINKS)
 .  for sub in ${MANSUBDIR}  .  for sub in ${MANSUBDIR}
 .     for lnk file in ${MLINKS}  .     for lnk file in ${MLINKS}
         @l=${DESTDIR}${MANDIR}${lnk:E}${sub}/${lnk}; \          @l=${DESTDIR}${MANDIR}${lnk:E}${sub}${lnk}; \
         t=${DESTDIR}${MANDIR}${file:E}${sub}/${file}; \          t=${DESTDIR}${MANDIR}${file:E}${sub}${file}; \
         echo $$t -\> $$l; \          echo $$t -\> $$l; \
         rm -f $$t; ln $$l $$t;          rm -f $$t; ln $$l $$t;
 .     endfor  .     endfor

Legend:
Removed from v.1.34  
changed lines
  Added in v.1.35