summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-03-03 13:14:54 +0000
committerRoy Marples <roy@marples.name>2008-03-03 13:14:54 +0000
commitf35c879bb8b703bd15805b19c55018bd9e9a4e6a (patch)
treeb78306fe127acfd5187b6e81e13893323f7c7a77
parent7a8e9d4ddbe121bf2cafb095e9ecf262bc074133 (diff)
downloadopenrc-f35c879bb8b703bd15805b19c55018bd9e9a4e6a.tar.gz
openrc-f35c879bb8b703bd15805b19c55018bd9e9a4e6a.tar.bz2
openrc-f35c879bb8b703bd15805b19c55018bd9e9a4e6a.tar.xz
Ignore fixes.
-rw-r--r--.gitignore1
-rw-r--r--mk/dist.mk2
-rw-r--r--mk/gitignore.mk5
-rw-r--r--mk/scripts.mk2
-rw-r--r--mk/subdir.mk1
5 files changed, 8 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 192fb09..46fdb46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
*.bz2
+openrc-0.1.tar.bz2
diff --git a/mk/dist.mk b/mk/dist.mk
index 1d3669d..2c40030 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -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 34d3539..fca262b 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 81fae3d..b84f05e 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 6d9031d..ca54176 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}