diff options
| author | Henrik Nord <[email protected]> | 2011-09-01 14:55:54 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2011-09-01 14:56:04 +0200 |
| commit | bf2d853857bb0e3a7fd5a2660b22b6e743f91f1c (patch) | |
| tree | 40017a52184970bd27ca1e487509751fa8884e12 /lib/observer/src/Makefile | |
| parent | ad0f1f1f7e18e98d772b6f76b7310a013b695c97 (diff) | |
| parent | a863e974b2281046419f60a0c9c2220a9bca83e0 (diff) | |
| download | otp-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
Diffstat (limited to 'lib/observer/src/Makefile')
| -rw-r--r-- | lib/observer/src/Makefile | 9 |
1 files changed, 6 insertions, 3 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 \ |