summaryrefslogtreecommitdiffstats
path: root/Schemas
diff options
context:
space:
mode:
authorkumpf <kumpf>2009-02-16 19:13:34 +0000
committerkumpf <kumpf>2009-02-16 19:13:34 +0000
commitbb0ec6024d4a2b1e9d4585c2526b7f02bf9f660c (patch)
tree3014fb5f5901b132cc7a4424a352a4894079bb60 /Schemas
parent64f8cd804513db12f53c88ebfa9360e31f44fdae (diff)
downloadtog-pegasus-bb0ec6024d4a2b1e9d4585c2526b7f02bf9f660c.zip
tog-pegasus-bb0ec6024d4a2b1e9d4585c2526b7f02bf9f660c.tar.gz
tog-pegasus-bb0ec6024d4a2b1e9d4585c2526b7f02bf9f660c.tar.xz
BUG#: 8382
TITLE: Inconsistent settings of ROOT in Makefiles DESCRIPTION: Set the ROOT based on relative directory hierarchy rather than using PEGASUS_ROOT.
Diffstat (limited to 'Schemas')
-rw-r--r--Schemas/Pegasus/InterOp/Makefile2
-rw-r--r--Schemas/Pegasus/Internal/Makefile2
-rw-r--r--Schemas/Pegasus/Makefile4
-rw-r--r--Schemas/Pegasus/ManagedSystem/Makefile2
4 files changed, 6 insertions, 4 deletions
diff --git a/Schemas/Pegasus/InterOp/Makefile b/Schemas/Pegasus/InterOp/Makefile
index 1b90faa..9771165 100644
--- a/Schemas/Pegasus/InterOp/Makefile
+++ b/Schemas/Pegasus/InterOp/Makefile
@@ -30,7 +30,7 @@
# Note: For best results, ensure that the InterOp namespace does not
# exist before calling this Makefile.
-ROOT = $(PEGASUS_ROOT)
+ROOT = ../../..
include $(ROOT)/mak/config.mak
include $(ROOT)/mak/configschema.mak
diff --git a/Schemas/Pegasus/Internal/Makefile b/Schemas/Pegasus/Internal/Makefile
index 775499f..2c6f3e6 100644
--- a/Schemas/Pegasus/Internal/Makefile
+++ b/Schemas/Pegasus/Internal/Makefile
@@ -30,7 +30,7 @@
# Note: For best results, ensure that the Internal namespace does not
# exist before calling this Makefile.
-ROOT = $(PEGASUS_ROOT)
+ROOT = ../../..
include $(ROOT)/mak/config.mak
include $(ROOT)/mak/configschema.mak
diff --git a/Schemas/Pegasus/Makefile b/Schemas/Pegasus/Makefile
index bf0201d..db06618 100644
--- a/Schemas/Pegasus/Makefile
+++ b/Schemas/Pegasus/Makefile
@@ -33,7 +33,9 @@
# This must be updated to an implementation independent repository
# remove function.
-include $(PEGASUS_ROOT)/mak/config.mak
+ROOT = ../..
+
+include $(ROOT)/mak/config.mak
all:
diff --git a/Schemas/Pegasus/ManagedSystem/Makefile b/Schemas/Pegasus/ManagedSystem/Makefile
index 0c5e565..690857b 100644
--- a/Schemas/Pegasus/ManagedSystem/Makefile
+++ b/Schemas/Pegasus/ManagedSystem/Makefile
@@ -30,7 +30,7 @@
# Note: For best results, ensure that the ManagedSystem namespace does not
# exist before calling this Makefile.
-ROOT = $(PEGASUS_ROOT)
+ROOT = ../../..
include $(ROOT)/mak/config.mak
include $(ROOT)/mak/configschema.mak