juju-gui

Merge lp:~bac/juju-gui/trunk into lp:juju-gui/experimental

  1. trunk
  2. Merge into trunk
Proposed by Brad Crittenden on 2012-11-06
Status: Merged
Merge reported by: Gary Poster
Merged at revision: not available
Proposed branch: lp:~bac/juju-gui/trunk
Merge into: lp:juju-gui/experimental
Diff against target: 13 lines (+2/-1)
1 file modified
Makefile (+2/-1)
To merge this branch: bzr merge lp:~bac/juju-gui/trunk
Reviewer Review Type Date Requested Status
Juju GUI Hackers 2012-11-06 Pending
Review via email: mp+133060@code.launchpad.net

Description of the Change

Fix broken Makefile.

If app/assets/sprite exists then regenerating sprites will fail as
that directory is the target of a 'mv' command.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2012-10-31 10:57:16 +0000
3+++ Makefile 2012-11-06 13:05:25 +0000
4@@ -28,7 +28,8 @@
5
6 $(SPRITE_GENERATED_FILES): node_modules/grunt node_modules/node-spritesheet $(SPRITE_SOURCE_FILES)
7 @node_modules/grunt/bin/grunt spritegen
8- @mv bin/sprite app/assets/sprite/
9+ @rm -Rf app/assets/sprite/
10+ @mv bin/sprite app/assets
11
12 $(NODE_TARGETS): package.json
13 @npm install

Subscribers

People subscribed via source and target branches