yellow team mailing list archive

[Brad Crittenden <bac@xxxxxxxxxxxxx>]

Brad Crittenden has proposed merging lp:~bac/juju-gui/trunk into lp:juju-gui.

Requested reviews:
  Juju GUI Hackers (juju-gui)

For more details, see:
https://code.launchpad.net/~bac/juju-gui/trunk/+merge/133060

Fix broken Makefile.

If app/assets/sprite exists then regenerating sprites will fail as
that directory is the target of a 'mv' command.
-- 
https://code.launchpad.net/~bac/juju-gui/trunk/+merge/133060
Your team Juju GUI Hackers is requested to review the proposed merge of lp:~bac/juju-gui/trunk into lp:juju-gui.

=== modified file 'Makefile'
--- Makefile	2012-10-31 10:57:16 +0000
+++ Makefile	2012-11-06 13:05:25 +0000
@@ -28,7 +28,8 @@
 
 $(SPRITE_GENERATED_FILES): node_modules/grunt node_modules/node-spritesheet $(SPRITE_SOURCE_FILES)
 	@node_modules/grunt/bin/grunt spritegen
-	@mv bin/sprite app/assets/sprite/
+	@rm -Rf app/assets/sprite/
+	@mv bin/sprite app/assets
 
 $(NODE_TARGETS): package.json
 	@npm install