summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Arendsen Hein <thomas@intevation.de>2010-06-24 16:23:59 (GMT)
committerThomas Arendsen Hein <thomas@intevation.de>2010-06-24 16:23:59 (GMT)
commita46ef5a7db6d79db5ee63252ff6c3bd04b70faad (patch)
tree7ddcb778644ce901d3f0d4585c4062980213c84b
parent8e46087cfc0ab19e96e0d102d3bd70135023adcd (diff)
downloadserver-a46ef5a7db6d79db5ee63252ff6c3bd04b70faad.tar.gz
make update: Should be removed by "make clean", mention two more manual packages
-rw-r--r--Makefile2
-rw-r--r--update.mk8
2 files changed, 7 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 66b6e78..8044aa3 100644
--- a/Makefile
+++ b/Makefile
@@ -104,7 +104,7 @@ pear: stage
done
.PHONY: clean
-clean: clean-base clean-kolab clean-pear clean-stage
+clean: clean-base clean-kolab clean-pear clean-stage clean-update
find . | grep "~$$" | xargs rm -rf
.PHONY: clean-stage
diff --git a/update.mk b/update.mk
index cd068cd..62eab96 100644
--- a/update.mk
+++ b/update.mk
@@ -49,6 +49,10 @@ KOLAB_SERVER_CURRENT=KOLAB_SERVER-$(CURRENT_VERSION)
.PHONY: update
update: current
+.PHONY: clean-update
+clean-update:
+ rm -rf update
+
.PHONY:current
current: $(KOLAB_SERVER_CVS)
@@ -72,9 +76,9 @@ $(KOLAB_SERVER_CVS): KOLAB_SERVER-2.2.3
fi; \
fi; \
done
- @for UPDATE in kolab-webadmin perl-kolab; \
+ @for UPDATE in kolab-webadmin perl-kolab Kolab_Format kolab-webclient; \
do \
- echo "Please update $$UPDATE manually using 'make dist' and 'openpkg rpm'"; \
+ echo "Please build $$UPDATE manually and install it via 'openpkg rpm'"; \
done
ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.3"