summaryrefslogtreecommitdiffstats
path: root/Makefile.Release
diff options
context:
space:
mode:
authordenise.eckstein <denise.eckstein>2008-08-19 17:47:14 +0000
committerdenise.eckstein <denise.eckstein>2008-08-19 17:47:14 +0000
commit80368b572163aaabbb7985d2988b0b571f23e1e6 (patch)
tree4a5d7a8e2966fbecfa817073441c119df7a4c16f /Makefile.Release
parentc839398b16e3acda4802c220838753fa8156a360 (diff)
downloadtog-pegasus-80368b572163aaabbb7985d2988b0b571f23e1e6.zip
tog-pegasus-80368b572163aaabbb7985d2988b0b571f23e1e6.tar.gz
tog-pegasus-80368b572163aaabbb7985d2988b0b571f23e1e6.tar.xz
BUG#: 7839
TITLE: Incorrect test for environment variable in Makefile.Release DESCRIPTION: In Makefile.Release, the tests to determine if PEGASUS_ENABLE_PRIVILEGE_SEPARATION and PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER are enabled are incorrect. The test should be for true, rather than defined.
Diffstat (limited to 'Makefile.Release')
-rw-r--r--Makefile.Release12
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.Release b/Makefile.Release
index 372b5f7..86d5fae 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -119,7 +119,7 @@ ifeq ($(PEGASUS_ENABLE_CQL),true)
libCIMQueryCapabilitiesProvider
endif
-ifdef PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER
+ifeq ($(PEGASUS_ENABLE_CMPI_PROVIDER_MANAGER),true)
PEGASUS_LIBRARIES += \
libcmpiCppImpl
PEGASUS_PROVIDER_MANAGERS += \
@@ -172,7 +172,7 @@ PEGASUS_ADMIN_CMDS = \
cimtrust \
repupgrade
-ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
+ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
PEGASUS_ADMIN_CMDS += \
cimservermain \
cimshutdown
@@ -875,7 +875,7 @@ _append_preSectionToSpecFile: FORCE
@$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-pre.spec \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
+ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
@$(ECHO-E) "# When Privilege Separation is enabled, create the" \
"'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \
@@ -926,14 +926,14 @@ _append_postSectionToSpecFile: FORCE
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " %PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
-ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
+ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
@$(ECHO-E) " chown -R $(CIMSERVERMAIN_USR) %PEGASUS_REPOSITORY_DIR" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " chgrp -R $(CIMSERVERMAIN_GRP) %PEGASUS_REPOSITORY_DIR" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
endif
@$(ECHO-E) " fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
+ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
@$(ECHO-E) " if [ -f %PEGASUS_TRACE_FILE_PATH ]; then" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " /bin/mv %PEGASUS_TRACE_FILE_PATH" \
@@ -1006,7 +1006,7 @@ _append_postunSectionToSpecFile: FORCE
@$(CAT) $(ROOT)/rpm/tog-specfiles/tog-pegasus-postun.spec \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
+ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
@$(ECHO-E) "# When Privilege Separation is enabled, delete the" \
"'$(CIMSERVERMAIN_USR)' user and ">> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "# '$(CIMSERVERMAIN_GRP)' group which are used" \