diff options
Diffstat (limited to 'mk/Makefile')
| -rw-r--r-- | mk/Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/mk/Makefile b/mk/Makefile index 90d43e2..567e001 100644 --- a/mk/Makefile +++ b/mk/Makefile @@ -1,6 +1,6 @@ -FILES = sys.mk mkc.configure.mk configure.mk mkc.mk \ - mkc.init.mk mkc_imp.intexts.mk mkc_imp.mk \ - mkc.minitest.mk mkc_imp.pkg-config.mk \ +FILES = sys.mk mkc.configure.mk mkc_imp.conf.mk mkc_imp.conf-cleanup.mk \ + mkc.mk mkc.init.mk mkc_imp.intexts.mk mkc_imp.mk \ + mkc.minitest.mk mkc_imp.pkg-config.mk mkc_imp.dpvars.mk \ mkc_imp.files.mk mkc_imp.inc.mk mkc_imp.info.mk mkc_imp.lib.mk \ mkc_imp.links.mk mkc_imp.man.mk mkc_imp.prog.mk \ mkc_imp.subprj.mk mkc_imp.conf-final.mk mkc_imp.rules.mk \ @@ -17,7 +17,7 @@ INFILES += mkc_imp.vars.mk ################################################# .for i in prog_mkdep prog_nbmkdep MKC_CHECK_CUSTOM += ${i} -MKC_CUSTOM_FN.${i} = ${.CURDIR}/../custom/${i} +MKC_CUSTOM_FN.${i} = ${.CURDIR}/../builtins/${i} .endfor MKC_CHECK_PROGS += makedepend @@ -38,12 +38,19 @@ mkdep_type = makedepend MKC_ERR_MSG += "mkdep(1) cannot be found" .endif +.if exists(/usr/xpg4/bin/nm) +PROG.nm ?= /usr/xpg4/bin/nm +.else +MKC_REQUIRE_PROGS += nm +.endif + makedepend_cmd ?= makedepend INTEXTS_REPLS += mkdep_cmd ${mkdep_cmd} INTEXTS_REPLS += makedepend_cmd ${makedepend_cmd} INTEXTS_REPLS += mkdep_type ${mkdep_type} INTEXTS_REPLS += featuresdir ${FEATURESDIR} +INTEXTS_REPLS += NM ${PROG.nm} ################################################# .include <mkc.mk> |