[2/2] webos commit: modifications to OS checking in Makefile

[he...@apache.org]

modifications to OS checking in Makefile


Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/commit/9f8802c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/tree/9f8802c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/diff/9f8802c4

Branch: refs/heads/master
Commit: 9f8802c45bc087a47ea62b32743e2eae55918ea9
Parents: 058a296
Author: hermwong <he...@gmail.com>
Authored: Mon May 7 13:19:05 2012 -0700
Committer: hermwong <he...@gmail.com>
Committed: Mon May 7 13:19:05 2012 -0700

----------------------------------------------------------------------
 Makefile |   32 ++++++--------------------------
 1 files changed, 6 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cordova-webos/blob/9f8802c4/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index ef2c033..17377e8 100755
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,6 @@ ECHO = echo
 ECHO_N = echo -n
 JAVA = java
 PGVERSION = 1.7.0
-UNAME=$(SHELL uname)
 
 NAME = `$(CAT) framework/appinfo.json | $(GREP) '"id"' | $(CUT) -d \" -f 4`
 VERSION = `$(CAT) framework/appinfo.json | $(GREP) '"version"' | $(CUT) -d \" -f 4`
@@ -34,43 +33,24 @@ clean_libs:
 	-$(RM_RF) lib
 	
 package:
-ifeq ($(UNAME), Linux)
-    palm-package framework/
-else
-ifeq ($(UNAME), Darwin)
-# mac OSX
+ifeq ($(findstring palm-package.bat,$(wildcard *.bat)), )
 	palm-package framework/
 else
-# assume windows OS
-    palm-package.bat framework/
-endif
+	palm-package.bat framework/
 endif
 	
-
 deploy:
-ifeq ($(UNAME), Linux)
+ifeq ($(findstring palm-install.bat,$(wildcard *.bat)), )
 	palm-install $(NAME)_$(VERSION)_all.ipk
 else
-ifeq ($(UNAME), Darwin)
-# mac OSX
-    palm-install $(NAME)_$(VERSION)_all.ipk
-else
-# assume windows OS
-    palm-install.bat $(NAME)_$(VERSION)_all.ipk
-endif
+	palm-install.bat $(NAME)_$(VERSION)_all.ipk
 endif
 	
 run:
-ifeq ($(UNAME), Linux)
+ifeq ($(findstring palm-install.bat,$(wildcard *.bat)), )
 	palm-launch $(NAME)
 else
-ifeq ($(UNAME), Darwin)
-# mac OSX
-    palm-launch $(NAME)
-else
-# assume windows OS
-    palm-launch.bat $(NAME)
-endif
+	palm-launch.bat $(NAME)
 endif
 	
 copy_js: