diff options
| author | Peter Lemenkov <peter@fedoraproject.org> | 2010-06-23 07:42:20 +0000 |
|---|---|---|
| committer | Peter Lemenkov <peter@fedoraproject.org> | 2010-06-23 07:42:20 +0000 |
| commit | 96952bd1ed3128c2b0cafc28e28432c5f17d3f85 (patch) | |
| tree | 50882b91c77d1acf75132db898e6e2d04d7dbf77 /otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch | |
| parent | aaa400a108ff5cd07b3dbe031ee13b4fcd568405 (diff) | |
| download | erlang-96952bd1ed3128c2b0cafc28e28432c5f17d3f85.tar.gz erlang-96952bd1ed3128c2b0cafc28e28432c5f17d3f85.tar.xz erlang-96952bd1ed3128c2b0cafc28e28432c5f17d3f85.zip | |
Ver. R14A
Diffstat (limited to 'otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch')
| -rw-r--r-- | otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch b/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch new file mode 100644 index 0000000..d056cfa --- /dev/null +++ b/otp-0008-Do-not-install-nteventlog-and-related-doc-files-on-n.patch @@ -0,0 +1,68 @@ +From d44bca67743373ff6c4446f62cb7e54a14f150d5 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov <lemenkov@gmail.com> +Date: Sat, 19 Jun 2010 09:59:39 +0400 +Subject: [PATCH 08/11] Do not install nteventlog and related doc-files on non-win32 systems + +Signed-off-by: Peter Lemenkov <lemenkov@gmail.com> +--- + lib/os_mon/doc/src/Makefile | 7 ++++++- + lib/os_mon/src/Makefile | 11 ++++++++++- + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile +index 8d75df9..95f0101 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 9a75446..a492a63 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) + sed -e 's;%VSN%;$(VSN);' $< > $@ ++else ++ sed -e 's;%VSN%;$(VSN);;s;,\s*nteventlog;;' $< > $@ ++endif + + $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk + sed -e 's;%VSN%;$(VSN);' $< > $@ +-- +1.7.0.1 + |