Set default make target to all.

[pwl6.git] / Makefile

diff --git a/Makefile b/Makefile
index 06f7e3f..408a9c2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-node-webkit-version := 0.10.2
-node-webkit-version-win-ia32.zip := 0.8.6
+node-webkit-version := 0.10.4
+all:
 
 .DELETE_ON_ERROR:
 include rules/programs.mk
@@ -16,7 +16,7 @@ include rules/pngcrush.mk
 APPLICATION := pwl6
 DISTDIR := build/dist
 VERSION := $(call git-describe)
-DISTROOT := $(DISTDIR)/$(APPLICATION)-$(VERSION)
+DISTROOT := $(DISTDIR)/$(APPLICATION)_$(VERSION)
 
 FIND_FILES := -type f ! -name '.*'
 FIND_JS := -type f -name '*.js'
@@ -97,6 +97,6 @@ $(DISTROOT).bare.zip: | .git
 %.nw: %.bare.zip tools/generate-nw
        $(RM) -r $@ $@.tmp
        $(UNZIP) -d $@.tmp $<
-       tools/generate-nw $@.tmp
+       tools/generate-nw $@.tmp `echo $(*F) | sed -E 's/.+_[^0-9]+//'`
        cd $@.tmp && $(ZIP) -r ../$(@F) .
        $(RM) -r $@.tmp