diff options
| author | dl.meetei <dl.meetei> | 2013-10-24 12:23:53 +0000 |
|---|---|---|
| committer | dl.meetei <dl.meetei> | 2013-10-24 12:23:53 +0000 |
| commit | bbf85c909b0f515e2d02163592bde1a7cfe131ab (patch) | |
| tree | fa5385ec5bf50592224d5d64137e84d6b41253e6 | |
| parent | 560578d46d597a2d2c2871b0101120ae8f7589ad (diff) | |
| download | tog-pegasus-RELEASE_2_13-branch.zip tog-pegasus-RELEASE_2_13-branch.tar.gz tog-pegasus-RELEASE_2_13-branch.tar.xz | |
BUG#: 9807RELEASE_2_13-branch
TITLE: Fail to do rpm build through RPMMakefile
DESCRIPTION: 2.13.1 version
| -rw-r--r-- | rpm/RPMMakefile | 80 |
1 files changed, 41 insertions, 39 deletions
diff --git a/rpm/RPMMakefile b/rpm/RPMMakefile index a3ea9f6..8117499 100644 --- a/rpm/RPMMakefile +++ b/rpm/RPMMakefile @@ -74,51 +74,53 @@ endif ## ############################################################################### ifeq ($(IDISTRO),RedHatEnterpriseServer) - DISTRO:=REDHAT - export PEGASUS_DISTRO_SUFFIX:= \ - $(if $(filter $(RELEASE),4.92 4.93 5 5.1 5.2 5.3),el5,$(if $(filter $(RELEASE),6 6.0),el6,$(if $(filter $(RELEASE),7 7.0),el7,xxx)) + DISTRO:=REDHAT + export PEGASUS_DISTRO_SUFFIX:= \ + $(if $(filter $(RELEASE),4.92 4.93 5 5.1 5.2 5.3),el5, \ + $(if $(filter $(RELEASE),6 6.0),el6, \ + $(if $(filter $(RELEASE),7 7.0),el7,xxx))) else - ifeq ($(findstring RedHat,$(IDISTRO)),RedHat) - DISTRO:=REDHAT - ifeq ($(findstring 7, $(RELEASE)),7) - export PEGASUS_DISTRO_SUFFIX=rhel7 - else - ifeq ($(findstring 6, $(RELEASE)),6) - export PEGASUS_DISTRO_SUFFIX=rhel6 - else - ifeq ($(findstring 5, $(RELEASE)),5) - export PEGASUS_DISTRO_SUFFIX=rhel5 - else - ifeq ($(findstring 4, $(RELEASE)),4) - export PEGASUS_DISTRO_SUFFIX=rhel4 - else - ifeq ($(findstring 3, $(RELEASE)),3) - export PEGASUS_DISTRO_SUFFIX=rhel3 - else - export PEGASUS_DISTRO_SUFFIX=xxx - endif - endif - endif - endif - endif + ifeq ($(findstring RedHat,$(IDISTRO)),RedHat) + DISTRO:=REDHAT + ifeq ($(findstring 7, $(RELEASE)),7) + export PEGASUS_DISTRO_SUFFIX=rhel7 else - ifeq ($(findstring SUSE,$(IDISTRO)),SUSE) - DISTRO:=SUSE - ifeq ($(RELEASE),9) - export PEGASUS_DISTRO_SUFFIX=sles9 + ifeq ($(findstring 6, $(RELEASE)),6) + export PEGASUS_DISTRO_SUFFIX=rhel6 + else + ifeq ($(findstring 5, $(RELEASE)),5) + export PEGASUS_DISTRO_SUFFIX=rhel5 + else + ifeq ($(findstring 4, $(RELEASE)),4) + export PEGASUS_DISTRO_SUFFIX=rhel4 + else + ifeq ($(findstring 3, $(RELEASE)),3) + export PEGASUS_DISTRO_SUFFIX=rhel3 else - ifeq ($(RELEASE),10) - export PEGASUS_DISTRO_SUFFIX=sles10 - else - ifeq ($(RELEASE),11) - export PEGASUS_DISTRO_SUFFIX=sles11 - else - export PEGASUS_DISTRO_SUFFIX=xxx - endif + export PEGASUS_DISTRO_SUFFIX=xxx endif + endif endif + endif endif -endif + else + ifeq ($(findstring SUSE,$(IDISTRO)),SUSE) + DISTRO:=SUSE + ifeq ($(RELEASE),9) + export PEGASUS_DISTRO_SUFFIX=sles9 + else + ifeq ($(RELEASE),10) + export PEGASUS_DISTRO_SUFFIX=sles10 + else + ifeq ($(RELEASE),11) + export PEGASUS_DISTRO_SUFFIX=sles11 + else + export PEGASUS_DISTRO_SUFFIX=xxx + endif + endif + endif + endif + endif endif ############################################################################### |