Module: check_mk Branch: master Commit: 28e42efba805f1013c7aaa78189a4ddff91e15aa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28e42efba805f1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 21 17:30:31 2017 +0100 CME: Fixed packing cme dist tar Change-Id: I3fcc6cea6d1bd1c308ee90b69a308409581b9d7d --- .gitignore | 1 + Makefile | 22 ++++++++-------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 4f9f839..735ca95 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ check_mk-*.spec check_mk-*.tar.gz clang-analyzer/ cmc-*.tar.gz +cme-*.tar.gz compile compile_commands.json config.guess diff --git a/Makefile b/Makefile index e269040..055f50d 100644 --- a/Makefile +++ b/Makefile @@ -266,7 +266,8 @@ cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks enterprise/ChangeLog cp enterprise/.werks/werks cmc-$(VERSION)/werks cp enterprise/ChangeLog cmc-$(VERSION)/ChangeLog-cmc sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile - cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * + cd cmc-$(VERSION) \ + && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * rm -rf cmc-$(VERSION) build: config.h @@ -326,22 +327,15 @@ dist: cme-$(VERSION).tar.gz cme-$(VERSION).tar.gz: .werks/cme-werks managed/ChangeLog rm -rf cme-$(VERSION) mkdir cme-$(VERSION) - tar cf - $(TAROPTS) \ - managed \ - | tar xf - -C cme-$(VERSION) - mv cme-$(VERSION)/managed/skel{,.permissions} cme-$(VERSION) + cp -pr managed cme-$(VERSION)/managed + mv cme-$(VERSION)/managed/ChangeLog cme-$(VERSION)/ChangeLog-cme + mv cme-$(VERSION)/managed/Makefile.omd cme-$(VERSION)/Makefile cp .werks/cme-werks cme-$(VERSION)/werks - cp managed/ChangeLog cme-$(VERSION)/ChangeLog-cme - sed -i '1 i\include ../../Makefile.omd' cme-$(VERSION)/Makefile + + cd cme-$(VERSION) \ + && tar czf ../cme-$(VERSION).tar.gz $(TAROPTS) * rm -rf cme-$(VERSION) -install: - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/web - cp -rv managed/web/* $(DESTDIR)$(OMD_ROOT)/share/check_mk/web - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_managed - install -m 644 ChangeLog-cme $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_managed/ChangeLog - mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks - install -m 644 werks $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks/werks-cme endif packages: