Separate install-files target for 'rules' subdir.

This commit is contained in:
matthieu 2009-06-06 19:44:01 +00:00
parent d2fb122c2f
commit 66bbf582f3

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.1.1.1 2009/06/06 17:55:01 matthieu Exp $ # $OpenBSD: Makefile.inc,v 1.2 2009/06/06 19:44:01 matthieu Exp $
TOP?= ../../.. TOP?= ../../..
XKB_DIR= ${.CURDIR}/${TOP}/dist/xkeyboard-config XKB_DIR= ${.CURDIR}/${TOP}/dist/xkeyboard-config
@ -17,7 +17,7 @@ ${DIR_DATA}: ${DATA}
rm -f $@ rm -f $@
cd ${.CURDIR} && ${XKBCOMP} -lfhlpR -o ${.OBJDIR}/$@ '*' cd ${.CURDIR} && ${XKBCOMP} -lfhlpR -o ${.OBJDIR}/$@ '*'
install: ${DATA} install-dir _SUBDIRUSE install: ${DATA} install-dir install-files _SUBDIRUSE
@for f in ${DATA}; do \ @for f in ${DATA}; do \
echo installing "$$f" ; \ echo installing "$$f" ; \
cmp -s ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f || ${INSTALL_DATA} ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f; done cmp -s ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f || ${INSTALL_DATA} ${XKB_DIR}/${XKB_SUBDIR}/$$f ${XKB_BASE}/${XKB_SUBDIR}/$$f; done
@ -29,6 +29,10 @@ install-dir: ${DIR_DATA}
install-dir: install-dir:
.endif .endif
.if !target(intall-files)
install-files:
.endif
.if defined(DIR_DATA) && !target(clean) .if defined(DIR_DATA) && !target(clean)
clean: clean:
rm -f ${DIR_DATA} rm -f ${DIR_DATA}