diff options
Diffstat (limited to 'community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch')
| -rw-r--r-- | community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch index 05ea1eec89..73b5b08928 100644 --- a/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch +++ b/community/erlang/0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -5,45 +5,47 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> +diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile +index 8e9a4c333c..2c9d395cdc 100644 --- a/lib/os_mon/doc/src/Makefile +++ b/lib/os_mon/doc/src/Makefile -@@ -36,12 +36,17 @@ +@@ -36,11 +36,16 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) # Target Specs # ---------------------------------------------------- XML_APPLICATION_FILES = ref_man.xml +ifeq ($(findstring win32,$(TARGET)),win32) -+NTEVENTLOG_DOCFILE=nteventlog.xml ++ NTEVENTLOG_DOCFILE=nteventlog.xml +else -+NTEVENTLOG_DOCFILE= ++ 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 + XML_REF6_FILES = os_mon_app.xml +diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile +index 923a31f290..3d0edf1ef9 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile -@@ -34,8 +34,13 @@ +@@ -34,7 +34,12 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) # ---------------------------------------------------- # Target Specs # ---------------------------------------------------- +-MODULES= disksup memsup cpu_sup os_mon os_sup os_mon_sysinfo nteventlog +ifeq ($(findstring win32,$(TARGET)),win32) -+NTEVENTLOG=nteventlog ++ NTEVENTLOG=nteventlog +else -+NTEVENTLOG= ++ NTEVENTLOG= +endif - MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \ -- nteventlog -+ $(NTEVENTLOG) ++MODULES= disksup memsup cpu_sup os_mon os_sup os_mon_sysinfo $(NTEVENTLOG) INCLUDE=../include CSRC=../c_src -@@ -79,7 +84,11 @@ +@@ -78,7 +83,11 @@ docs: # ---------------------------------------------------- $(APP_TARGET): $(APP_SRC) ../vsn.mk |