From de19547904f4da50b477573d651cdd3fb731a71f Mon Sep 17 00:00:00 2001 From: David Bartley Date: Fri, 9 Nov 2007 20:19:00 -0500 Subject: [PATCH] Fix Makefile so that members.xml always gets regenerated --- Makefile | 2 +- about/Makefile | 1 + common.mk.in | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0138951..0a0b4bb 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ build: noroot mkoutdir common.mk $(OUTPUTS) find ! -regex '.*/\..*' -type d ! -perm 2775 -print0 | xargs -r0 chmod 2775 || true find ! -regex '.*/\..*' -type d ! -group www -print0 | xargs -r0 chgrp www || true -.PHONY += noroot +.PHONY: noroot noroot: if test $$UID = 0; then echo "don't build as root!"; exit 1; fi diff --git a/about/Makefile b/about/Makefile index e38a596..2b0eba4 100644 --- a/about/Makefile +++ b/about/Makefile @@ -6,6 +6,7 @@ include ../common.mk $(OUTDIR)members.html: $(OUTDIR)members.xml +.PHONY: $(OUTDIR)members.xml $(OUTDIR)members.xml: test -e /usr/bin/ceoquery || (echo 'Erorr: ceoquery not found'; exit 1) echo '' > $@ diff --git a/common.mk.in b/common.mk.in index 6af5f69..6c11ce4 100644 --- a/common.mk.in +++ b/common.mk.in @@ -8,14 +8,14 @@ else endif OUTPUTS = $(addprefix $(OUTDIR),$(FILES)) -.PHONY += mkoutdir +.PHONY: mkoutdir mkoutdir: mkdir -p $(OUTDIR) -.PHONY += build +.PHONY: build build: $(OUTPUTS) -.PHONY += clean +.PHONY: clean clean: ifeq "$(ROOT)" "/users/www/www" rm -rf $(OUTDIR)/*