aboutsummaryrefslogtreecommitdiffstats
path: root/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
blob: 74f4587134eda2b64d67baf72328643ed310a81a (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
--- otp_src_17.5/lib/os_mon/doc/src/Makefile
+++ otp_src_17.5-fixed/lib/os_mon/doc/src/Makefile
@@ -35,12 +35,17 @@
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
+ifeq ($(findstring win32,$(TARGET)),win32)
+NTEVENTLOG_DOCFILE=nteventlog.xml
+else
+NTEVENTLOG_DOCFILE=
+endif
 XML_REF3_FILES = cpu_sup.xml \
 	disksup.xml \
 	memsup.xml \
 	os_mon_mib.xml \
 	os_sup.xml \
-	nteventlog.xml
+	$(NTEVENTLOG_DOCFILE)
 
 XML_REF6_FILES = os_mon_app.xml 
 
--- otp_src_17.5/lib/os_mon/ebin/os_mon.app
+++ otp_src_17.5-fixed/lib/os_mon/ebin/os_mon.app
@@ -21,7 +21,7 @@
    [{description, "CPO  CXC 138 46"},
     {vsn, "2.3.1"},
     {modules, [os_mon, os_mon_mib, os_sup,
-               disksup, memsup, cpu_sup, os_mon_sysinfo, nteventlog]},
+               disksup, memsup, cpu_sup, os_mon_sysinfo]},
     {registered, [os_mon_sup, os_mon_sysinfo, disksup, memsup, cpu_sup, 
                   os_sup_server]},
     {applications, [kernel, stdlib, sasl]},
--- otp_src_17.5/lib/os_mon/src/Makefile
+++ otp_src_17.5-fixed/lib/os_mon/src/Makefile
@@ -33,8 +33,13 @@
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
+ifeq ($(findstring win32,$(TARGET)),win32)
+NTEVENTLOG=nteventlog
+else
+NTEVENTLOG=
+endif
 MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
-	nteventlog
+	 $(NTEVENTLOG)
 
 INCLUDE=../include
 CSRC=../c_src
@@ -78,7 +83,11 @@
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
+ifeq ($(findstring win32,$(TARGET)),win32)
 	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@
+else
+	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);;s;,\s*nteventlog;;' $< > $@
+endif
 
 $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
 	$(vsn_verbose)sed -e 's;%VSN%;$(VSN);' $< > $@