diff options
| author | John Regan <john@jrjrtech.com> | 2015-02-19 10:31:56 -0500 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2015-02-19 15:55:16 +0000 |
| commit | d619822e8905167b4a0b4e993d8c0e1c64aa445a (patch) | |
| tree | 1e3029ad6905003f7e6bd4dddf24374485c926fb /testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch | |
| parent | f8b1a52e683440dcb7e4b3222f33669a79805802 (diff) | |
testing/erlang: updating to 17.4
Signed-off-by: Leonardo Arena <rnalrd@alpinelinux.org>
Diffstat (limited to 'testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch')
| -rw-r--r-- | testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch new file mode 100644 index 00000000000..cf8e970cba3 --- /dev/null +++ b/testing/erlang/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -0,0 +1,61 @@ +From: Peter Lemenkov <lemenkov@gmail.com> +Date: Sat, 19 Jun 2010 09:59:39 +0400 +Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 + systems + +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 08fd23e..5606cfc 100644 +--- a/lib/os_mon/doc/src/Makefile ++++ b/lib/os_mon/doc/src/Makefile +@@ -35,12 +35,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) + # 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 + +diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile +index cd2dade..4e78cf8 100644 +--- a/lib/os_mon/src/Makefile ++++ b/lib/os_mon/src/Makefile +@@ -33,8 +33,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) + # ---------------------------------------------------- + # 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 @@ docs: + # ---------------------------------------------------- + + $(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);' $< > $@ |