diff --git a/makefile b/makefile index 70306f94..bf5f4c3f 100644 --- a/makefile +++ b/makefile @@ -101,10 +101,10 @@ deb: $(BINNAME) chmod 755 $(DebBuildDir)/DEBIAN/preinst chmod 755 $(DebBuildDir)/DEBIAN/postinst chmod 755 $(DebBuildDir)/DEBIAN/postrm - cp -rf $(BuildDir)/omc/* $(DebBuildDir)/usr/local/omc/ + cp -rf $(BuildDir)/* $(DebBuildDir)/ + #cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d + #cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ chmod +x $(DebBuildDir)/usr/local/omc/bin/* - cp -rf $(BuildDir)/nginx/* $(DebBuildDir)/etc/nginx/conf.d - cp -rf $(BuildDir)/systemd/*.service $(DebBuildDir)/lib/systemd/system/ #sed -i.bak 's/YYYYMMDD/'$(date +"%Y%m%d")'/g' $(DebBuildDir)/DEBIAN/control dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb @@ -131,8 +131,8 @@ rpm: $(BINNAME) cp -rf $(EmsFEDir)/* $(FrontBuildDir)/front >/dev/null chmod 755 $(BinDir)/* # chmod 755 $(BinDir2)/* - cp -rf $(BuildDir)/omc $(RpmBuildDir)/BUILD - cp -rf $(BuildDir)/nginx $(RpmBuildDir)/BUILD - cp -rf $(BuildDir)/systemd $(RpmBuildDir)/BUILD + cp -rf $(BuildDir)/* $(RpmBuildDir)/BUILD/ + #cp -rf $(BuildDir)/nginx $(RpmBuildDir)/BUILD/etc/ + #cp -rf $(BuildDir)/systemd $(RpmBuildDir)/BUILD/lib/ cd $(RpmBuildDir) rpmbuild -bb -D "_topdir $(RpmBuildDir)" $(RpmBuildDir)/SPECS/omc.spec