d

makefile

@@ -18,6 +18,7 @@ BuildOMCEtcDir = $(BuildOMCDir)/etc
 BuildLibDir = $(BuildDir)/lib
 BuildLibSystemDir = $(BuildLibDir)/systemd/system
 DebBuildDir = $(EmsBuildRoot)/debbuild
+DebBuild2204Dir = $(EmsBuildRoot)/debbuild/22.04
 RpmBuildDir = $(EmsBuildRoot)/rpmbuild
 OmcInstallDir = /usr/local/omc
 ReleaseDir = $(EmsBuildRoot)/release
@@ -89,6 +90,12 @@ dist:
 		--exclude=../initems/initems 
 
 deb: $(BINNAME)
+ifeq ($(shell lsb_release -r --short), 22.04)
+	DebBuildDir = $(DebBuild2204Dir)
+	DebPkgFile = $(PROJECT)-$(VERSION)-22.04-$(Release).$(PLATFORM).deb
+else 
+	DebPkgFile = $(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb
+endif
 	cp -rf $(RestagentDir)/$(RESTAGENT) $(BuildOMCBinDir)
 	cp -rf $(CrontaskDir)/$(CRONTASK) $(BuildOMCBinDir)
 	cp -rf $(SshSvcDir)/$(SshSvcBin) $(BuildOMCBinDir)
@@ -112,11 +119,7 @@ deb: $(BINNAME)
 	#sed -i.bak 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control
 	sed -i 's/YYYYMMDD/$(shell date +"%Y%m%d")/g' $(DebBuildDir)/DEBIAN/control
 	sed -i '73 s/user: root/user: agtuser/g' $(DebBuildDir)/usr/local/omc/etc/default/restconf.yaml
-ifeq ($(shell lsb_release -r --short), 22.04)
-	dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-22.04-$(Release).$(PLATFORM).deb
-else 
-	dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(PROJECT)-$(VERSION)-$(Release).$(PLATFORM).deb
-endif
+	dpkg -b $(DebBuildDir) $(ReleaseDebs)/$(DebPkgFile)
 
 rpm: $(BINNAME)
 	cp -rf $(RestagentDir)/$(RESTAGENT) $(BuildOMCBinDir)