diff options
-rw-r--r-- | share/mk/bsd.dep.mk | 12 | ||||
-rw-r--r-- | share/mk/bsd.info.mk | 8 | ||||
-rw-r--r-- | share/mk/bsd.lib.mk | 2 | ||||
-rw-r--r-- | share/mk/bsd.prog.mk | 2 | ||||
-rw-r--r-- | share/mk/sys.mk | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index aac8337..a76455a 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -94,13 +94,13 @@ CLEANFILES+= ${_LC} .for _YC in ${_YSRC:R}.c SRCS:= ${SRCS:S/${_YSRC}/${_YC}/} CLEANFILES+= ${_YC} -.if ${YFLAGS:M-d} != "" && ${SRCS:My.tab.h} +.if !empty(YFLAGS:M-d) && !empty(SRCS:My.tab.h) .ORDER: ${_YC} y.tab.h ${_YC} y.tab.h: ${_YSRC} ${YACC} ${YFLAGS} ${.ALLSRC} cp y.tab.c ${_YC} CLEANFILES+= y.tab.c y.tab.h -.elif ${YFLAGS:M-d} != "" +.elif !empty(YFLAGS:M-d) .for _YH in ${_YC:R}.h .ORDER: ${_YC} ${_YH} ${_YC} ${_YH}: ${_YSRC} @@ -128,18 +128,18 @@ depend: beforedepend ${DEPENDFILE} afterdepend DPSRCS+= ${SRCS} ${DEPENDFILE}: ${DPSRCS} rm -f ${DEPENDFILE} -.if ${DPSRCS:M*.[cS]} != "" +.if !empty(DPSRCS:M*.[cS]) ${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \ ${CFLAGS:M-nostdinc*} ${CFLAGS:M-[BID]*} \ ${.ALLSRC:M*.[cS]} .endif -.if ${DPSRCS:M*.cc} != "" || ${DPSRCS:M*.C} != "" || ${DPSRCS:M*.cpp} != "" || \ - ${DPSRCS:M*.cxx} != "" +.if !empty(DPSRCS:M*.cc) || !empty(DPSRCS:M*.C) || !empty(DPSRCS:M*.cpp) || \ + !empty(DPSRCS:M*.cxx) ${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \ ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BID]*} \ ${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cpp} ${.ALLSRC:M*.cxx} .endif -.if ${DPSRCS:M*.m} != "" +.if !empty(DPSRCS:M*.m) ${MKDEPCMD} -f ${DEPENDFILE} -a ${MKDEP} \ ${OBJCFLAGS:M-nostdinc*} ${OBJCFLAGS:M-[BID]*} \ ${OBJCFLAGS:M-Wno-import*} \ diff --git a/share/mk/bsd.info.mk b/share/mk/bsd.info.mk index 5e32a3a..67b1ab3 100644 --- a/share/mk/bsd.info.mk +++ b/share/mk/bsd.info.mk @@ -160,24 +160,24 @@ ${INFO}.texi: ${SRCS} .endif # tex garbage -.if ${FORMATS:Mps} || ${FORMATS:Mdvi} || ${FORMATS:Mlatin1} +.if !empty(FORMATS:Mps) || !empty(FORMATS:Mdvi) || !empty(FORMATS:Mlatin1) .for _f in aux cp fn ky log out pg toc tp vr dvi CLEANFILES+= ${INFO:S/$/.${_f}/} ${INFO:S/$/-la.${_f}/} .endfor CLEANFILES+= ${INFO:S/$/-la.texi/} .endif -.if ${FORMATS:Mhtml} +.if !empty(FORMATS:Mhtml) CLEANFILES+= ${INFO:S/$/.info.*.html/} ${INFO:S/$/.info/} .endif .if !defined(NOINFO) && defined(INFO) install: ${INSTALLINFODIRS} -.if ${IFILES:N*.html} +.if !empty(IFILES:N*.html) ${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ ${IFILES:N*.html} ${DESTDIR}${INFODIR} .endif -.if ${FORMATS:Mhtml} +.if !empty(FORMATS:Mhtml) ${INSTALL} -o ${INFOOWN} -g ${INFOGRP} -m ${INFOMODE} \ ${INFO:S/$/.info.*.html/} ${DESTDIR}${INFODIR} .endif diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index 3679068..7a9b9ad 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -15,7 +15,7 @@ .if !defined(SHLIB_NAME) && defined(LIB) && defined(SHLIB_MAJOR) SHLIB_NAME= lib${LIB}.so.${SHLIB_MAJOR} .endif -.if defined(SHLIB_NAME) && ${SHLIB_NAME:M*.so.*} +.if defined(SHLIB_NAME) && !empty(SHLIB_NAME:M*.so.*) SHLIB_LINK?= ${SHLIB_NAME:R} .endif SONAME?= ${SHLIB_NAME} diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 8ae4063..7e34965 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -33,7 +33,7 @@ PROG= ${PROG_CXX} .if defined(SRCS) # If there are Objective C sources, link with Objective C libraries. -.if ${SRCS:M*.m} != "" +.if !empty(SRCS:M*.m) OBJCLIBS?= -lobjc LDADD+= ${OBJCLIBS} .endif diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 8c20c49..aeb8f92 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -44,7 +44,7 @@ CXXFLAGS ?= ${CFLAGS:C/-std=[a-z:0-9]+//} CPP ?= cpp -.if ${.MAKEFLAGS:M-s} == "" +.if empty(.MAKEFLAGS:M-s) ECHO ?= echo ECHODIR ?= echo .else |