|
 |
9433160 |
From 5d52142fcfa2b4a776f80592ae0033e17628adb7 Mon Sep 17 00:00:00 2001
|
|
|
96952bd |
From: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
96952bd |
Date: Sat, 19 Jun 2010 10:25:29 +0400
|
|
|
f6c950e |
Subject: [PATCH 09/13] Do not install *.bat files on non-win32 machines
|
|
|
96952bd |
|
|
|
96952bd |
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
|
|
|
96952bd |
---
|
|
|
96952bd |
lib/observer/src/Makefile | 8 ++++++--
|
|
|
96952bd |
lib/webtool/priv/Makefile | 8 ++++++--
|
|
|
96952bd |
2 files changed, 12 insertions(+), 4 deletions(-)
|
|
|
96952bd |
|
|
|
96952bd |
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
|
|
|
96952bd |
index dde1ea1..fe5eba1 100644
|
|
|
96952bd |
--- a/lib/observer/src/Makefile
|
|
|
96952bd |
+++ b/lib/observer/src/Makefile
|
|
|
96952bd |
@@ -56,11 +56,15 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
|
|
|
96952bd |
PRIVDIR= ../priv
|
|
|
96952bd |
WEBTOOLFILES= $(PRIVDIR)/crashdump_viewer.tool
|
|
|
96952bd |
BINDIR= $(PRIVDIR)/bin
|
|
|
96952bd |
+ifeq ($(findstring win32,$(TARGET)),win32)
|
|
|
96952bd |
+WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/getop.bat
|
|
|
96952bd |
+else
|
|
|
96952bd |
+WIN32_EXECUTABLES=
|
|
|
96952bd |
+endif
|
|
|
96952bd |
EXECUTABLES= \
|
|
|
96952bd |
$(BINDIR)/etop \
|
|
|
96952bd |
$(BINDIR)/getop \
|
|
|
96952bd |
- $(BINDIR)/etop.bat \
|
|
|
96952bd |
- $(BINDIR)/getop.bat
|
|
|
96952bd |
+ $(WIN32_EXECUTABLES)
|
|
|
96952bd |
CDVDIR= $(PRIVDIR)/crashdump_viewer
|
|
|
96952bd |
GIF_FILES= \
|
|
|
96952bd |
$(CDVDIR)/collapsd.gif \
|
|
|
96952bd |
diff --git a/lib/webtool/priv/Makefile b/lib/webtool/priv/Makefile
|
|
|
96952bd |
index 56ab772..c29e912 100644
|
|
|
96952bd |
--- a/lib/webtool/priv/Makefile
|
|
|
96952bd |
+++ b/lib/webtool/priv/Makefile
|
|
|
96952bd |
@@ -39,8 +39,12 @@ HTDOCS_FILES = root/doc/index.html \
|
|
|
96952bd |
root/doc/tool_management.html \
|
|
|
96952bd |
root/doc/start_info.html
|
|
|
96952bd |
|
|
|
96952bd |
-SCRIPTS = bin/start_webtool \
|
|
|
96952bd |
- bin/start_webtool.bat
|
|
|
96952bd |
+ifeq ($(findstring win32,$(TARGET)),win32)
|
|
|
96952bd |
+WIN32_SCRIPTS= bin/start.bat
|
|
|
96952bd |
+else
|
|
|
96952bd |
+WIN32_SCRIPTS=
|
|
|
96952bd |
+endif
|
|
|
96952bd |
+SCRIPTS = bin/start_webtool $(WIN32_SCRIPTS)
|
|
|
96952bd |
|
|
|
96952bd |
# ----------------------------------------------------
|
|
|
96952bd |
# FLAGS
|
|
|
96952bd |
--
|
|
|
f6c950e |
1.7.3.2
|
|
|
96952bd |
|