diff options
| author | Roy Marples <roy@marples.name> | 2008-03-03 13:14:54 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-03-03 13:14:54 +0000 |
| commit | f35c879bb8b703bd15805b19c55018bd9e9a4e6a (patch) | |
| tree | b78306fe127acfd5187b6e81e13893323f7c7a77 /mk | |
| parent | 7a8e9d4ddbe121bf2cafb095e9ecf262bc074133 (diff) | |
Ignore fixes.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/dist.mk | 2 | ||||
| -rw-r--r-- | mk/gitignore.mk | 5 | ||||
| -rw-r--r-- | mk/scripts.mk | 2 | ||||
| -rw-r--r-- | mk/subdir.mk | 1 |
4 files changed, 7 insertions, 3 deletions
@@ -2,7 +2,7 @@ # Copyright 2008 Roy Marples <roy@marples.name> GITREF?= HEAD -DISTPREFIX?= ${PROG}-${VERSION} +DISTPREFIX?= ${NAME}-${VERSION} DISTFILE?= ${DISTPREFIX}.tar.bz2 CLEANFILES+= ${DISTFILE} diff --git a/mk/gitignore.mk b/mk/gitignore.mk index 34d3539e..fca262be 100644 --- a/mk/gitignore.mk +++ b/mk/gitignore.mk @@ -3,8 +3,11 @@ IGNOREFILES+= ${CLEANFILES} +.PHONY: .gitignore + .gitignore: - for obj in ${IGNOREFILES}; do \ + @if test -n "${IGNOREFILES}"; then echo "Ignoring ${IGNOREFILES}"; fi + @for obj in ${IGNOREFILES}; do \ if ! test -r .gitignore; then \ echo "$${obj}" > .gitignore || exit $$?; \ elif ! grep -q "^$${obj}$$" .gitignore; then \ diff --git a/mk/scripts.mk b/mk/scripts.mk index 81fae3d2..b84f05ef 100644 --- a/mk/scripts.mk +++ b/mk/scripts.mk @@ -40,6 +40,6 @@ install: all realinstall ${INSTALLAFTER} # so we ensure that it has a bogus argument CLEANFILES+= ${OBJS} clean: - if test -n "${CLEANFILES}"; then rm -f ${CLEANFILES}; fi + @if test -n "${CLEANFILES}"; then echo "rm -f ${CLEANFILES}"; rm -f ${CLEANFILES}; fi include ${MK}/gitignore.mk diff --git a/mk/subdir.mk b/mk/subdir.mk index 6d9031d2..ca54176e 100644 --- a/mk/subdir.mk +++ b/mk/subdir.mk @@ -31,6 +31,7 @@ done all: ${_SUBDIR} clean: + @if test -n "${CLEANFILES}"; then echo "rm -f ${CLEANFILES}"; rm -f ${CLEANFILES}; fi ${_SUBDIR} realinstall: ${_SUBDIR} |