[erlang-patches] [PATCH 1/1] Do not install *.bat files on non-win32 machines

Peter Lemenkov lemenkov@REDACTED
Thu Jul 21 10:09:59 CEST 2011


From: Hans Ulrich Niedermann <hun@REDACTED>

Signed-off-by: Peter Lemenkov <lemenkov@REDACTED>
Signed-off-by: Hans Ulrich Niedermann <hun@REDACTED>
---
 lib/observer/src/Makefile |    9 ++++++---
 lib/webtool/priv/Makefile |    8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index 2d06cb6..3875b62 100644
--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
@@ -56,13 +56,16 @@ TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
 PRIVDIR= ../priv
 WEBTOOLFILES= $(PRIVDIR)/crashdump_viewer.tool
 BINDIR= $(PRIVDIR)/bin
+ifeq ($(findstring win32,$(TARGET)),win32)
+WIN32_EXECUTABLES= $(BINDIR)/etop.bat $(BINDIR)/getop.bat $(BINDIR)/cdv.bat
+else
+WIN32_EXECUTABLES=
+endif
 EXECUTABLES= \
 	$(BINDIR)/etop \
 	$(BINDIR)/getop \
 	$(BINDIR)/cdv \
-	$(BINDIR)/etop.bat \
-	$(BINDIR)/getop.bat \
-	$(BINDIR)/cdv.bat
+	$(WIN32_EXECUTABLES)
 CDVDIR= $(PRIVDIR)/crashdump_viewer
 GIF_FILES= \
 	$(CDVDIR)/collapsd.gif \
diff --git a/lib/webtool/priv/Makefile b/lib/webtool/priv/Makefile
index 56ab772..6e1c660 100644
--- a/lib/webtool/priv/Makefile
+++ b/lib/webtool/priv/Makefile
@@ -39,8 +39,12 @@ HTDOCS_FILES =  root/doc/index.html \
 	        root/doc/tool_management.html \
 	        root/doc/start_info.html 
 
-SCRIPTS = bin/start_webtool \
-	  bin/start_webtool.bat
+ifeq ($(findstring win32,$(TARGET)),win32)
+WIN32_SCRIPTS= bin/start_webtool.bat
+else
+WIN32_SCRIPTS=
+endif
+SCRIPTS = bin/start_webtool $(WIN32_SCRIPTS)
 
 # ----------------------------------------------------
 # FLAGS
-- 
1.7.6




More information about the erlang-patches mailing list