(file) Return to Makefile.Release CVS log (file) (dir) Up to [Pegasus] / pegasus

Diff for /pegasus/Makefile.Release between version 1.105.2.2 and 1.105.2.3

version 1.105.2.2, 2013/06/03 22:34:01 version 1.105.2.3, 2013/07/20 18:32:34
Line 143 
Line 143 
    libInteropProvider    libInteropProvider
 endif endif
  
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_USE_NET_SNMP),true)
    PEGASUS_LIBRARIES += \    PEGASUS_LIBRARIES += \
       libsnmpIndicationHandler       libsnmpIndicationHandler
 endif endif
Line 176 
Line 176 
        libJMPIProviderManager        libJMPIProviderManager
 endif endif
  
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_USE_NET_SNMP),true)
 PEGASUS_LIBRARY_LINKS += \ PEGASUS_LIBRARY_LINKS += \
    libsnmpIndicationHandler    libsnmpIndicationHandler
 endif endif
Line 502 
Line 502 
         @$(ECHO-E) "PEGASUS_SSL_KEY_FILE=$(PEGASUS_SSL_KEY_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus         @$(ECHO-E) "PEGASUS_SSL_KEY_FILE=$(PEGASUS_SSL_KEY_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus         @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         @$(ECHO-E) "PEGASUS_FLAVOR=$(PEGASUS_FLAVOR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus         @$(ECHO-E) "PEGASUS_FLAVOR=$(PEGASUS_FLAVOR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
         $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus          $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc | $(TAIL) -n+29 >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
 endif endif
  
 setpermissions_PegasusSystemFiles: FORCE setpermissions_PegasusSystemFiles: FORCE
Line 814 
Line 814 
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-buildRequires.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-buildRequires.spec \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_USE_NET_SNMP),true)
         @$(ECHO-E) "BuildRequires:      net-snmp-devel" \         @$(ECHO-E) "BuildRequires:      net-snmp-devel" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 endif endif
Line 825 
Line 825 
         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)         @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-requires.spec \         @$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-requires.spec \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 ifdef PEGASUS_USE_NET_SNMP  ifeq ($(PEGASUS_USE_NET_SNMP),true)
         @$(ECHO-E) "Requires:           net-snmp" \         @$(ECHO-E) "Requires:           net-snmp" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 endif endif


Legend:
Removed from v.1.105.2.2  
changed lines
  Added in v.1.105.2.3

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2