diff --git a/makefile b/makefile index d12ea5f5..10e64d6a 100644 --- a/makefile +++ b/makefile @@ -80,22 +80,22 @@ deb: $(BINNAME) chmod 755 $(DebBuildDir)/DEBIAN/* cp -rf $(BuildDir)/omc/* $(DebBuildDir)/usr/local/omc/ chmod +x $(DebBuildDir)/usr/local/omc/bin/* -# cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d + cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION).$(RelDate).$(PLATFORM).deb rpm: $(BINNAME) cp -rf ./restagent/$(RESTAGENT) $(BinDir) cp -rf ./crontask/$(CRONTASK) $(BinDir) - cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir2) - $(BinWriterDir)/binWriter $(BinDir)/$(RESTAGENT) $(RestagentSize) - $(BinWriterDir)/binWriter $(BinDir)/$(CRONTASK) $(CrontaskSize) - cp -rf $(MiscDir)/ne-hosts $(BinDir) - cp -rf ./nbi/$(NBI_ALARM)/bin/$(NBI_ALARM) $(BinDir2) - cp -rf ./nbi/$(NBI_AGENT)/bin/$(NBI_AGENT) $(BinDir2) - cp -rf ./$(4A_AGENT)/bin/$(4A_AGENT) $(BinDir2) - cp -rf $(MiscDir)/* $(BinDir2) - rm -rf $(BinDir2)/ne-hosts + cp -rf $(SshSvcDir)/$(SshSvcBin) $(BinDir) +# $(BinWriterDir)/binWriter $(BinDir)/$(RESTAGENT) $(RestagentSize) +# $(BinWriterDir)/binWriter $(BinDir)/$(CRONTASK) $(CrontaskSize) +# cp -rf $(MiscDir)/ne-hosts $(BinDir) +# cp -rf ./nbi/$(NBI_ALARM)/bin/$(NBI_ALARM) $(BinDir2) +# cp -rf ./nbi/$(NBI_AGENT)/bin/$(NBI_AGENT) $(BinDir2) +# cp -rf ./$(4A_AGENT)/bin/$(4A_AGENT) $(BinDir2) + cp -rf $(MiscDir)/* $(BinDir) +# rm -rf $(BinDir2)/ne-hosts cp -rf $(ConfigEtcDir)/* $(BuildDir)/omc/etc/ cp -rf $(DBSQLSrcDir)/* $(BuildDir)/omc/etc/db/ rm -rf $(FrontBuildDir)/* @@ -103,9 +103,9 @@ rpm: $(BINNAME) mkdir -p $(FrontBuildDir)/front cp -rf $(EmsFEDir)/* $(FrontBuildDir)/front >/dev/null chmod 755 $(BinDir)/* - chmod 755 $(BinDir2)/* +# chmod 755 $(BinDir2)/* cp -rf $(BuildDir)/omc $(RpmBuildDir)/BUILD cp -rf $(BuildDir)/nginx $(RpmBuildDir)/BUILD cp -rf $(BuildDir)/systemd $(RpmBuildDir)/BUILD cd $(RpmBuildDir) - rpmbuild -bb -D "_topdir $(RpmBuildDir)" --sign $(RpmBuildDir)/SPECS/omc.spec + rpmbuild -bb -D "_topdir $(RpmBuildDir)" $(RpmBuildDir)/SPECS/omc.spec