aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-09-01 14:55:54 +0200
committerHenrik Nord <[email protected]>2011-09-01 14:56:04 +0200
commitbf2d853857bb0e3a7fd5a2660b22b6e743f91f1c (patch)
tree40017a52184970bd27ca1e487509751fa8884e12
parentad0f1f1f7e18e98d772b6f76b7310a013b695c97 (diff)
parenta863e974b2281046419f60a0c9c2220a9bca83e0 (diff)
downloadotp-bf2d853857bb0e3a7fd5a2660b22b6e743f91f1c.tar.gz
otp-bf2d853857bb0e3a7fd5a2660b22b6e743f91f1c.tar.bz2
otp-bf2d853857bb0e3a7fd5a2660b22b6e743f91f1c.zip
Merge branch 'pl/no_bat_files_none_win32' into dev
* pl/no_bat_files_none_win32: Do not install *.bat files on non-win32 machines OTP-9515
-rw-r--r--lib/observer/src/Makefile9
-rw-r--r--lib/webtool/priv/Makefile8
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
index 2d06cb6bc4..3875b62101 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 56ab772c45..6e1c6606fe 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