[Collab-qa-commits] r1436 - ddpo-by-mail

[Raphael Geissert]

Author: atomo64-guest
Date: 2009-04-20 18:49:48 +0000 (Mon, 20 Apr 2009)
New Revision: 1436

Modified:
   ddpo-by-mail/Makefile
Log:
Minor fixes to properly cleanup data/ and really update all files


Modified: ddpo-by-mail/Makefile
===================================================================
--- ddpo-by-mail/Makefile	2009-04-20 18:28:53 UTC (rev 1435)
+++ ddpo-by-mail/Makefile	2009-04-20 18:49:48 UTC (rev 1436)
@@ -9,6 +9,7 @@
 WGET_OPTIONS:=-nv -N
 WGET:=wget $(WGET_OPTIONS)
 DATA_DIR:=data
+FORCE:=
 
 all:
 
@@ -16,32 +17,32 @@
 	mkdir $@
 
 update: $(DATA_DIR)
-	@cd $(DATA_DIR) && make -f ../Makefile $(UPDATE_TARGETS)
+	@cd $(DATA_DIR) && $(MAKE) -f ../Makefile FORCE=phony $(UPDATE_TARGETS)
 
-bts2ldap_fullindex:
+bts2ldap_fullindex: $(FORCE)
 	[ -L fullindex ] || ln -s $@ fullindex
 	$(WGET) http://qa.debian.org/data/bts2ldap/fullindex
 
-ddpo_packages ddpo_maintainers:
+ddpo_packages ddpo_maintainers: $(FORCE)
 	$(WGET) http://qa.debian.org/data/ddpo/results/$@
 
-testing-status.raw ood_excuses.txt:
+testing-status.raw ood_excuses.txt: $(FORCE)
 	$(WGET) http://qa.debian.org/~lucas/$@
 
-dehs.txt:
+dehs.txt: $(FORCE)
 	[ -L ddpomail.txt ] || ln -s $@ ddpomail.txt
 	$(WGET) http://dehs.alioth.debian.org/ddpomail.txt
 
-pts_subscriptions.txt:
-	ssh master /org/packages.qa.debian.org/bin/get-summary-subscribers.pl > $@
+pts_subscriptions.txt: $(FORCE)
+	-ssh master /org/packages.qa.debian.org/bin/get-summary-subscribers.pl > $@
 
-wnpp_rm:
-	$(WGET) http://qa.debian.org/data/bts/wnpp_rm
+wnpp_rm: $(FORCE)
+	$(WGET) http://qa.debian.org/data/bts/$@
 
-lintian-list.txt:
+lintian-list.txt: $(FORCE)
 	$(WGET) http://qa.debian.org/data/$@
 
-debian-installer/binary-%: phony
+debian-installer/binary-%: $(FORCE)
 	mkdir -p `dirname "$@"`
 	( cd `dirname "$@"` && $(WGET) $(MIRROR)/$(DI_PATH)/binary-$* ; ) || touch $@
 
@@ -52,6 +53,10 @@
 	    $(MAKE) -f ../Makefile `echo "$(ARCHITECTURES)" | tr ',' '\n' | sed 's,^,debian-installer/binary-,g;s,$$,/Packages.gz,g'`; \
 	fi
 
+clean-update::
+	$(RM) -f $(DATA_DIR)/debian-installer/binary-*/Packages.gz
+	rmdir -p --ignore-fail-on-non-empty $(DATA_DIR)/debian-installer/binary-*
+
 debian-installer:
 	mkdir $@
 
@@ -60,7 +65,7 @@
 	find -L $(DATA_DIR) -type l -exec unlink '{}' ';'
 	rmdir $(DATA_DIR) || ls $(DATA_DIR)
 
-clean-update:
+clean-update::
 	cd $(DATA_DIR) && $(RM) -f $(UPDATE_TARGETS)
 
 .PHONY: clean clean-update update $(UPDATE_TARGETS) phony