[BACK]Return to Makefile CVS log [TXT][DIR] Up to [local] / xenocara

Diff for /xenocara/Makefile between version 1.46 and 1.47

version 1.46, 2012/04/01 23:00:24 version 1.47, 2012/08/18 10:38:39
Line 28 
Line 28 
   
 NOOBJ=  NOOBJ=
   
 build: beforebuild _SUBDIRUSE  build:
           exec ${SUDO} ${MAKE} bootstrap-root
           cd util/macros && exec ${MAKE} -f Makefile.bsd-wrapper
           exec ${SUDO} ${MAKE} beforebuild
           exec ${MAKE} realbuild
           exec ${SUDO} ${MAKE} afterbuild
   
   realbuild: _SUBDIRUSE
           # that's all folks
   
 bootstrap:  bootstrap:
         ${SUDO} ${MAKE} distrib-dirs          exec ${SUDO} ${MAKE} bootstrap-root
         cd ${.CURDIR}/share/mk \  
                 && exec ${SUDO} ${MAKE} X11BASE=${X11BASE} install  
   
 beforebuild: bootstrap  bootstrap-root:
         cd ${.CURDIR}/util/macros \          exec ${MAKE} distrib-dirs
                 && ${MAKE} -f Makefile.bsd-wrapper \          exec ${MAKE} install-mk
                 && exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install  
         exec ${SUDO} ${MAKE} includes  
   
 beforeinstall:  beforeinstall beforebuild:
         ${MAKE} distrib-dirs          cd util/macros && exec ${MAKE} -f Makefile.bsd-wrapper install
         ${MAKE} includes          exec ${MAKE} includes
   
 afterinstall:  afterinstall afterbuild:
         ${MAKE} install-mk          exec ${MAKE} fix-appd
         ${MAKE} fix-appd  
         ${MAKE} font-cache  
         /usr/libexec/makewhatis -v ${DESTDIR}/usr/X11R6/man          /usr/libexec/makewhatis -v ${DESTDIR}/usr/X11R6/man
   
 realinstall: _SUBDIRUSE  
   
 install-mk:  install-mk:
 .if defined(DESTDIR) && (${DESTDIR} != "" || ${DESTDIR} != "/")          cd share/mk && exec ${MAKE} X11BASE=${X11BASE} install
         cd ${.CURDIR}/share/mk \  
                 && ${MAKE} X11BASE=${X11BASE} install  
 .endif  
   
 font-cache:  
         @echo "running fc-cache"  
         if test -z "$(DESTDIR)"; then \  
                 fc-cache -s -v ;\  
         else\  
                 fc-cache -c ${DESTDIR} -s -v ;\  
         fi  
   
 fix-appd:  fix-appd:
         # Make sure /usr/local/lib/X11/app-defaults is a link          # Make sure /usr/local/lib/X11/app-defaults is a link
         if [ ! -L $(DESTDIR)${LOCALAPPD} ]; then \          if [ ! -L $(DESTDIR)${LOCALAPPD} ]; then \
Line 78 
Line 67 
             ln -s ${REALAPPD} ${DESTDIR}${LOCALAPPD}; \              ln -s ${REALAPPD} ${DESTDIR}${LOCALAPPD}; \
         fi          fi
   
 release: release-clean distrib-dirs release-install dist  font-cache:
 .ORDER: release-clean distrib-dirs release-install dist          cd font/alias && exec ${MAKE} -f Makefile.bsd-wrapper afterinstall
   
   release: release-clean release-install dist
   .ORDER: release-clean release-install dist
   
 release-clean:  release-clean:
 .if ! ( defined(DESTDIR) && defined(RELEASEDIR) )  .if ! ( defined(DESTDIR) && defined(RELEASEDIR) )
         @echo You must set DESTDIR and RELEASEDIR for a release.; exit 255          @echo You must set DESTDIR and RELEASEDIR for a release.; exit 255
Line 97 
Line 89 
         fi          fi
   
 release-install:  release-install:
         @${MAKE} install          @exec ${SUDO} ${MAKE} bootstrap-root
           @exec ${MAKE} install
 .if ${MACHINE} == zaurus  .if ${MACHINE} == zaurus
         @if [ -f $(DESTDIR)/etc/X11/xorg.conf ]; then \          @if [ -f $(DESTDIR)/etc/X11/xorg.conf ]; then \
          echo "Not overwriting existing" $(DESTDIR)/etc/X11/xorg.conf; \           echo "Not overwriting existing" $(DESTDIR)/etc/X11/xorg.conf; \
Line 119 
Line 112 
 dist:  dist:
         cd distrib/sets && \          cd distrib/sets && \
                 env MACHINE=${MACHINE} ksh ./maketars ${OSrev} ${OSREV} && \                  env MACHINE=${MACHINE} ksh ./maketars ${OSrev} ${OSREV} && \
                 (env MACHINE=${MACHINE} ksh ./checkflist ${OSREV} || true)                  { env MACHINE=${MACHINE} ksh ./checkflist ${OSREV} || true ; }
   
   
 distrib-dirs:  distrib-dirs:
 .if defined(DESTDIR) && ${DESTDIR} != ""  .if defined(DESTDIR) && ${DESTDIR} != ""
           # running mtree under ${DESTDIR}
         mtree -qdef /etc/mtree/BSD.x11.dist -p ${DESTDIR} -U          mtree -qdef /etc/mtree/BSD.x11.dist -p ${DESTDIR} -U
 .else  .else
           # running mtree
         mtree -qdef /etc/mtree/BSD.x11.dist -p / -U          mtree -qdef /etc/mtree/BSD.x11.dist -p / -U
 .endif  .endif
   
   
 .PHONY: all build beforeinstall install afterinstall release clean cleandir \  .PHONY: all build beforeinstall install afterinstall release clean cleandir \
         dist distrib-dirs fix-appd          dist distrib-dirs fix-appd beforebuild bootstrap afterbuild realbuild \
           install-mk bootstrap-root
   
 .include <bsd.subdir.mk>  .include <bsd.subdir.mk>
 .include <bsd.xorg.mk>  .include <bsd.xorg.mk>
Legend:
Removed from v.1.46  
changed lines
  Added in v.1.47