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

Diff for /xenocara/Makefile between version 1.10 and 1.11

version 1.10, 2006/12/17 22:47:35 version 1.11, 2006/12/23 13:08:07
Line 3 
Line 3 
   
 X11BASE?=       /usr/X11R6  X11BASE?=       /usr/X11R6
   
   LOCALAPPD=/usr/local/lib/X11/app-defaults
   LOCALAPPX=/usr/local/lib/X11
   REALAPPD=/etc/X11/app-defaults
   
 SUBDIR= proto data/bitmaps lib app data/xkbdata xserver driver util doc  SUBDIR= proto data/bitmaps lib app data/xkbdata xserver driver util doc
 .ifndef NOFONTS  .ifndef NOFONTS
 SUBDIR+= font  SUBDIR+= font
Line 30 
Line 34 
         ${MAKE} distrib-dirs          ${MAKE} distrib-dirs
         ${MAKE} includes          ${MAKE} includes
   
 afterinstall:  afterinstall: fix-appd
         cd distrib/notes; ${MAKE} install          cd distrib/notes; ${MAKE} install
         /usr/libexec/makewhatis ${DESTDIR}/usr/X11R6/man          /usr/libexec/makewhatis ${DESTDIR}/usr/X11R6/man
   
 realinstall: _SUBDIRUSE  realinstall: _SUBDIRUSE
   
 obj: _SUBDIRUSE  fix-appd:
           # Make sure /usr/local/lib/X11/app-defaults is a link
           if [ ! -L $(DESTDIR)${LOCALAPPD} ]; then \
               if [ -d $(DESTDIR)${LOCALAPPD} ]; then \
                   mv $(DESTDIR)${LOCALAPPD}/* $(DESTDIR)${REALAPPD}; \
                   rmdir $(DESTDIR)${LOCALAPPD}; \
               fi; \
               mkdir -p ${DESTDIR}${LOCALAPPX}; \
               ln -s ${REALAPPD} ${DESTDIR}${LOCALAPPD}; \
           fi
   
 release: release-clean distrib-dirs release-install dist  release: release-clean distrib-dirs release-install dist
   
Line 90 
Line 103 
                 -p ${DESTDIR}${X11ETC}/ -U                  -p ${DESTDIR}${X11ETC}/ -U
   
 .PHONY: all build beforeinstall install afterinstall release clean cleandir \  .PHONY: all build beforeinstall install afterinstall release clean cleandir \
         distrib-dirs          distrib-dirs fix-appd
   
   .include <bsd.subdir.mk>
 .include <bsd.xorg.mk>  .include <bsd.xorg.mk>
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.11