← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~thumper/launchpad/makefile-fix into lp:launchpad

 

Tim Penhey has proposed merging lp:~thumper/launchpad/makefile-fix into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers): release-critical
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  #683503 codebrowse staging is breaking in the Makefile start
  https://bugs.launchpad.net/bugs/683503


Fix the codebrowse restart breakage that is the fallout of one of my previous branches that had some left-over cruft in the build Makefile rule.
-- 
https://code.launchpad.net/~thumper/launchpad/makefile-fix/+merge/42810
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~thumper/launchpad/makefile-fix into lp:launchpad.
=== modified file 'Makefile'
--- Makefile	2010-11-30 12:53:20 +0000
+++ Makefile	2010-12-06 04:01:56 +0000
@@ -139,9 +139,6 @@
 	touch $(CODEHOSTING_ROOT)/config/launchpad-lookup.txt
 
 build: compile apidoc jsbuild css_combine
-	mkdir -p $(CODEHOSTING_ROOT)/mirrors
-	touch $(CODEHOSTING_ROOT)/rewrite.log
-	chmod 777 $(CODEHOSTING_ROOT)/rewrite.log
 
 css_combine: sprite_css bin/combine-css
 	${SHHH} bin/combine-css
@@ -376,7 +373,7 @@
 	$(RM) logs/thread*.request
 	$(RM) -r lib/mailman
 	$(RM) -rf lib/canonical/launchpad/icing/build/*
-	$(RM) -r $(CODEHOSTING_ROOT)
+	$(RM) -rf $(CODEHOSTING_ROOT)
 	$(RM) -rf $(APIDOC_DIR)
 	$(RM) -rf $(APIDOC_DIR).tmp
 	$(RM) $(BZR_VERSION_INFO)


Follow ups