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

Diff for /src/share/mk/bsd.port.mk between version 1.70 and 1.71

version 1.70, 1999/02/27 18:28:13 version 1.71, 1999/02/28 23:23:47
Line 111 
Line 111 
 # WRKBUILD              - The directory where the port is actually built, useful for  # WRKBUILD              - The directory where the port is actually built, useful for
 #                 ports that need a separate directory (default: ${WRKSRC}).  #                 ports that need a separate directory (default: ${WRKSRC}).
 #                                 This is intended for GNU configure.  #                                 This is intended for GNU configure.
   # SEPARATE_BUILD
   #               - define if the port can build in directory separate from
   #                 WRKSRC. This redefines WRKBUILD to be arch-dependent,
   #                 along with the configure, build and install cookies
 # DISTNAME              - Name of port or distribution.  # DISTNAME              - Name of port or distribution.
 # DISTFILES             - Name(s) of archive file(s) containing distribution  # DISTFILES             - Name(s) of archive file(s) containing distribution
 #                                 (default: ${DISTNAME}${EXTRACT_SUFX}).  #                                 (default: ${DISTNAME}${EXTRACT_SUFX}).
Line 475 
Line 479 
 .include "${PORTSDIR}/../Makefile.inc"  .include "${PORTSDIR}/../Makefile.inc"
 .endif  .endif
   
 # Don't change these!!!  These names are built into the _TARGET_USE macro,  
 # there is no way to refer to them cleanly from within the macro AFAIK.  
 EXTRACT_COOKIE?=        ${WRKDIR}/.extract_done  EXTRACT_COOKIE?=        ${WRKDIR}/.extract_done
   PATCH_COOKIE?=          ${WRKDIR}/.patch_done
   .if defined(SEPARATE_BUILD)
   CONFIGURE_COOKIE?=      ${WRKBUILD}/.configure_done
   INSTALL_PRE_COOKIE?=${WRKBUILD}/.install_started
   INSTALL_COOKIE?=        ${WRKBUILD}/.install_done
   BUILD_COOKIE?=          ${WRKBUILD}/.build_done
   PACKAGE_COOKIE?=        ${WRKBUILD}/.package_done
   .else
 CONFIGURE_COOKIE?=      ${WRKDIR}/.configure_done  CONFIGURE_COOKIE?=      ${WRKDIR}/.configure_done
 INSTALL_PRE_COOKIE?=${WRKDIR}/.install_started  INSTALL_PRE_COOKIE?=${WRKDIR}/.install_started
 INSTALL_COOKIE?=        ${WRKDIR}/.install_done  INSTALL_COOKIE?=        ${WRKDIR}/.install_done
 BUILD_COOKIE?=          ${WRKDIR}/.build_done  BUILD_COOKIE?=          ${WRKDIR}/.build_done
 PATCH_COOKIE?=          ${WRKDIR}/.patch_done  
 PACKAGE_COOKIE?=        ${WRKDIR}/.package_done  PACKAGE_COOKIE?=        ${WRKDIR}/.package_done
   .endif
   
 # Miscellaneous overridable commands:  # Miscellaneous overridable commands:
 GMAKE?=                 gmake  GMAKE?=                 gmake
Line 586 
Line 596 
 WRKSRC?=                ${WRKDIR}/${DISTNAME}  WRKSRC?=                ${WRKDIR}/${DISTNAME}
 .endif  .endif
   
   .if defined(SEPARATE_BUILD)
   WRKBUILD?=              ${WRKDIR}/build-${ARCH}
   .else
 WRKBUILD?=              ${WRKSRC}  WRKBUILD?=              ${WRKSRC}
   .endif
   
 .if defined(WRKOBJDIR)  .if defined(WRKOBJDIR)
 __canonical_PORTSDIR!=  cd ${PORTSDIR}; pwd -P  __canonical_PORTSDIR!=  cd ${PORTSDIR}; pwd -P
Line 1439 
Line 1453 
 .if make(real-install) && !defined(NO_PKG_REGISTER)  .if make(real-install) && !defined(NO_PKG_REGISTER)
         @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} fake-pkg          @cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} fake-pkg
 .endif  .endif
 .if !make(real-fetch) \  .if make(real-extract)
         && (!make(real-patch) || !defined(PATCH_CHECK_ONLY)) \          @${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}
         && (!make(real-package) || !defined(PACKAGE_NOINSTALL))  .endif
         @${TOUCH} ${TOUCH_FLAGS} ${WRKDIR}/.${.TARGET:S/^real-//}_done  .if make(real-patch) && !defined(PATCH_CHECK_ONLY)
           @${TOUCH} ${TOUCH_FLAGS} ${PATCH_COOKIE}
   .endif
   .if make(real-configure)
           @${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE}
   .endif
   .if make(real-install)
           @${TOUCH} ${TOUCH_FLAGS} ${INSTALL_COOKIE}
   .endif
   .if make(real-build)
           @${TOUCH} ${TOUCH_FLAGS} ${BUILD_COOKIE}
   .endif
   .if make(real-package) && !defined(PACKAGE_NOINSTALL)
           @${TOUCH} ${TOUCH_FLAGS} ${PACKAGE_COOKIE}
 .endif  .endif
   
 ################################################################  ################################################################

Legend:
Removed from v.1.70  
changed lines
  Added in v.1.71