View | Details | Raw Unified | Return to bug 22661
Collapse All | Expand All

(-)src/usr.sbin/mergemaster/mergemaster.sh (-1 / +1 lines)
Lines 428-434 Link Here
428 
  esac
 428 
  esac
429 

          429
          

        

        

          430
          
  { cd ${SOURCEDIR} &&

          430
          
  { cd ${SOURCEDIR} &&

        

          
            

              431
              
    make DESTDIR=${DESTDIR} distrib-dirs &&


              431
              
    touch .foobar && rm .foobar && make DESTDIR=${DESTDIR} distrib-dirs

            

        

          432
          
    make DESTDIR=${TEMPROOT} distrib-dirs &&

          432
          
    make DESTDIR=${TEMPROOT} distrib-dirs &&

        

        

          433
          
    make DESTDIR=${TEMPROOT} -DNO_MAKEDEV distribution;} ||

          433
          
    make DESTDIR=${TEMPROOT} -DNO_MAKEDEV distribution;} ||

        

        

          434
          
  { echo '';

          434
          
  { echo '';

        






  

  Return to bug 22661