[BACK]Return to bsd.pkg.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / mk

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /pkgsrc/mk/bsd.pkg.mk between version 1.1540.2.10 and 1.1540.2.12

version 1.1540.2.10, 2005/01/10 16:15:25 version 1.1540.2.12, 2005/01/24 18:25:28
Line 7 
Line 7 
 # Please see the pkgsrc/doc/guide manual for details on the  # Please see the pkgsrc/doc/guide manual for details on the
 # variables used in this make file template.  # variables used in this make file template.
 #  #
   # XXX tv: rev 1.1554 is not merged yet (phase "error handlers")
   #
   
 ############################################################################  ############################################################################
 # Include any preferences, if not already included, and common definitions  # Include any preferences, if not already included, and common definitions
Line 1137  CONFIG_GUESS_OVERRIDE?=  \
Line 1139  CONFIG_GUESS_OVERRIDE?=  \
         config.guess */config.guess */*/config.guess          config.guess */config.guess */*/config.guess
 CONFIG_SUB_OVERRIDE?=           \  CONFIG_SUB_OVERRIDE?=           \
         config.sub */config.sub */*/config.sub          config.sub */config.sub */*/config.sub
   CONFIG_RPATH_OVERRIDE?=         # set by platform file as needed
 #  #
 # By default, override config.status for GNU configure packages.  We  # By default, override config.status for GNU configure packages.  We
 # never want it to execute after the configure phase has ended as it  # never want it to execute after the configure phase has ended as it
Line 2405  do-ltconfig-override:
Line 2408  do-ltconfig-override:
 .  endfor  .  endfor
 .endif  .endif
   
 .if defined(CONFIG_GUESS_OVERRIDE) || defined(CONFIG_SUB_OVERRIDE)  
 _CONFIGURE_PREREQ+=     do-config-star-override  _CONFIGURE_PREREQ+=     do-config-star-override
 .PHONY: do-config-star-override  .PHONY: do-config-star-override
 do-config-star-override:  do-config-star-override:
 .  if defined(CONFIG_GUESS_OVERRIDE) && !empty(CONFIG_GUESS_OVERRIDE)  .if defined(GNU_CONFIGURE)
   .  if !empty(CONFIG_GUESS_OVERRIDE)
 .    for _pattern_ in ${CONFIG_GUESS_OVERRIDE}  .    for _pattern_ in ${CONFIG_GUESS_OVERRIDE}
         ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \          ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \
         for file in ${_pattern_}; do                                    \          for file in ${_pattern_}; do                                    \
Line 2421  do-config-star-override:
Line 2424  do-config-star-override:
         done          done
 .    endfor  .    endfor
 .  endif  .  endif
 .  if defined(CONFIG_SUB_OVERRIDE) && !empty(CONFIG_SUB_OVERRIDE)  .  if !empty(CONFIG_SUB_OVERRIDE)
 .    for _pattern_ in ${CONFIG_SUB_OVERRIDE}  .    for _pattern_ in ${CONFIG_SUB_OVERRIDE}
         ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \          ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \
         for file in ${_pattern_}; do                                    \          for file in ${_pattern_}; do                                    \
Line 2433  do-config-star-override:
Line 2436  do-config-star-override:
         done          done
 .    endfor  .    endfor
 .  endif  .  endif
   .  if !empty(CONFIG_RPATH_OVERRIDE)
   .    for _pattern_ in ${CONFIG_RPATH_OVERRIDE}
           ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC};                        \
           for file in ${_pattern_}; do                                    \
                   if [ -f "$$file" ]; then                                \
                           ${RM} -f $$file;                                \
                           ${LN} -s ${PKGSRCDIR}/mk/gnu-config/config.rpath \
                                   $$file;                                 \
                   fi;                                                     \
           done
   .    endfor
   .  endif
 .endif  .endif
   
 PKGCONFIG_OVERRIDE_SED= \  PKGCONFIG_OVERRIDE_SED= \

Legend:
Removed from v.1.1540.2.10  
changed lines
  Added in v.1.1540.2.12

CVSweb <webmaster@jp.NetBSD.org>