summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ldap/clients/Makefile8
-rw-r--r--ldap/cm/Makefile10
2 files changed, 1 insertions, 17 deletions
diff --git a/ldap/clients/Makefile b/ldap/clients/Makefile
index d255caf0..8fd81ef1 100644
--- a/ldap/clients/Makefile
+++ b/ldap/clients/Makefile
@@ -49,13 +49,7 @@ BUILD_ROOT=../..
include $(BUILD_ROOT)/nsconfig.mk
include $(BUILD_ROOT)/ldap/javarules.mk
-all: _ldaptags _online _dsgw _dsmlgw
-
-_ldaptags:
- cd ldaptags; $(MAKE)
-
-_online:
- cd online; $(MAKE)
+all: _dsgw _dsmlgw
_dsgw:
cd dsgw; $(MAKE)
diff --git a/ldap/cm/Makefile b/ldap/cm/Makefile
index 21ec1ddc..3bba1b3e 100644
--- a/ldap/cm/Makefile
+++ b/ldap/cm/Makefile
@@ -362,16 +362,6 @@ endif # USE_DSMLGW
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/ldif/*.ldif $(RELDIR)/bin/slapd/install/ldif
$(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/dsml/*.dsml $(RELDIR)/bin/slapd/install/dsml
-# Package online and ldaptags only if they exist: they are only built on
-# Solaris and NT but packaged on all platforms
- if [ -d $(BUILD_DRIVE)$(BUILD_ROOT)/../dist/online ] ; then \
- $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/../dist/online/*.war $(RELDIR)/clients/slapd ; \
- $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/online/doc/*.html $(RELDIR)/clients/slapd ; \
- $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/online/ldif/*.ldif $(RELDIR)/clients/slapd ; \
- fi
-# if [ -d $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/ldaptags ] ; then \
-# $(INSTALL) -m 644 $(BUILD_DRIVE)$(BUILD_ROOT)/ldap/clients/ldaptags/doc/*.html $(RELDIR)/clients/slapd ; \
-# fi
### Package up the orgchart ###
ifeq ($(USE_ORGCHART), 1)