diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2005-01-28 21:57:05 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2005-01-28 21:57:05 +0000 |
| commit | 0b00cd4edc87f82fddde3a089d16f2e416305209 (patch) | |
| tree | f47e944cfa83dcd946fad259f2f37e1499785ac3 /ldap/servers/snmp | |
| parent | b323e287076458e646831a3b5cec0262ac60c5fd (diff) | |
| download | ds-0b00cd4edc87f82fddde3a089d16f2e416305209.tar.gz ds-0b00cd4edc87f82fddde3a089d16f2e416305209.tar.xz ds-0b00cd4edc87f82fddde3a089d16f2e416305209.zip | |
remove references to ldapserver from makefiles; use BUILD_ROOT instead of MCOM_ROOT and NSROOT; BUILD_ROOT is now the ldapserver directory rather than its parent
Diffstat (limited to 'ldap/servers/snmp')
| -rw-r--r-- | ldap/servers/snmp/Makefile | 6 | ||||
| -rw-r--r-- | ldap/servers/snmp/ntagt/Makefile | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ldap/servers/snmp/Makefile b/ldap/servers/snmp/Makefile index 4e40d8c0..20949b8a 100644 --- a/ldap/servers/snmp/Makefile +++ b/ldap/servers/snmp/Makefile @@ -15,7 +15,7 @@ # # -MCOM_ROOT = ../../../.. +BUILD_ROOT = ../../.. LDAP_SRC = ../.. NOSTDCLEAN=true # don't let nsconfig.mk define target clean @@ -27,14 +27,14 @@ INCLDEST = $(OBJDIR)/ns-ldapagt/include BINDIR = $(LDAP_SERVER_RELDIR) EXTDEST = $(BINDIR) -include $(MCOM_ROOT)/ldapserver/nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk include $(LDAP_SRC)/nsldap.mk MCC_SERVER= ARCH := $(shell uname -s) ifneq ($(ARCH), WINNT) -ARCH := $(shell $(MCOM_ROOT)/ldapserver/nsarch) +ARCH := $(shell $(BUILD_ROOT)/nsarch) endif diff --git a/ldap/servers/snmp/ntagt/Makefile b/ldap/servers/snmp/ntagt/Makefile index 22605b2f..bb4c0d22 100644 --- a/ldap/servers/snmp/ntagt/Makefile +++ b/ldap/servers/snmp/ntagt/Makefile @@ -9,7 +9,7 @@ # SNMP NT Subagent Common Rulesets # ############################################################################# -MCOM_ROOT = ../../../../.. +BUILD_ROOT = ../../../.. MSRV_ROOT = ../../.. SLAPD_ROOT = $(MSRV_ROOT)/servers/slapd SNMP_ROOT = $(MSRV_ROOT)/servers/snmp @@ -20,12 +20,12 @@ NOSTDCLEAN = true # don't let nsconfig.mk define target clean NOSTDSTRIP = true # don't let nsconfig.mk define target strip NSPR20 = true -include $(MCOM_ROOT)/ldapserver/nsconfig.mk +include $(BUILD_ROOT)/nsconfig.mk include $(MSRV_ROOT)/nsldap.mk OBJ_SUFFIX = obj -INCLUDES += -I../../slapd -I$(MCOM_ROOT)/ldapserver/ldap/include +INCLUDES += -I../../slapd -I$(BUILD_ROOT)/ldap/include CCOPTS += $(CFLAGS) $(DLL_CFLAGS) $(MCC_INCLUDE) $(INCLUDES) -I$(SNMP_ROOT) CXXOPTS += $(CFLAGS) $(DLL_CXXFLAGS) $(MCC_INCLUDE) $(INCLUDES) -I$(SNMP_ROOT) |