(file) Return to RPMMakefile CVS log (file) (dir) Up to [Pegasus] / pegasus / rpm

Diff for /pegasus/rpm/RPMMakefile between version 1.17.4.1 and 1.19.2.1

version 1.17.4.1, 2011/10/11 18:17:56 version 1.19.2.1, 2013/10/24 12:23:53
Line 76 
Line 76 
 ifeq ($(IDISTRO),RedHatEnterpriseServer) ifeq ($(IDISTRO),RedHatEnterpriseServer)
     DISTRO:=REDHAT     DISTRO:=REDHAT
     export PEGASUS_DISTRO_SUFFIX:= \     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,xxx))      $(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 else
     ifeq ($(findstring RedHat,$(IDISTRO)),RedHat)     ifeq ($(findstring RedHat,$(IDISTRO)),RedHat)
         DISTRO:=REDHAT         DISTRO:=REDHAT
       ifeq ($(findstring 7, $(RELEASE)),7)
         export PEGASUS_DISTRO_SUFFIX=rhel7
       else
         ifeq ($(findstring 6, $(RELEASE)),6)         ifeq ($(findstring 6, $(RELEASE)),6)
            export PEGASUS_DISTRO_SUFFIX=rhel6            export PEGASUS_DISTRO_SUFFIX=rhel6
         else         else
Line 97 
Line 102 
         endif         endif
             endif             endif
         endif         endif
       endif
     else     else
         ifeq ($(findstring SUSE,$(IDISTRO)),SUSE)         ifeq ($(findstring SUSE,$(IDISTRO)),SUSE)
             DISTRO:=SUSE             DISTRO:=SUSE


Legend:
Removed from v.1.17.4.1  
changed lines
  Added in v.1.19.2.1

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2