Added more support for building from source, specifically support for

NET-SNMP.  Also a couple of minor clean up items.

buildpaths.mk

@@ -79,4 +79,7 @@ DB_MAJOR_MINOR := db-4.2
 # internal builds rename this to be db42
 #DB_MAJOR_MINOR := db42
 #component_name:=$(DB_MAJOR_MINOR)
-#db_path_config:=$(BUILD_ROOT)/../$(component_name)
+#db_path_config:=$(BUILD_ROOT)/../$(db_component_name)
+
+NETSNMP_SOURCE_ROOT = $(BUILD_ROOT)/../net-snmp-5.2.1
+#NETSNMP_BUILD_DIR = $(BUILD_ROOT)/../net-snmp

components.mk

@@ -360,9 +360,9 @@ endif
 
 ### Net-SNMP package ######################################
 ifdef NETSNMP_SOURCE_ROOT
-  NETSNMP_LIBPATH = $(NETSNMP_SOURCE_ROOT)/lib
-  NETSNMP_INCDIR = $(NETSNMP_SOURCE_ROOT)/include
-  NETSNMP_BINDIR = $(NETSNMP_SOURCE_ROOT)/bin
+  NETSNMP_LIBPATH = $(NETSNMP_SOURCE_ROOT)/built/lib
+  NETSNMP_INCDIR = $(NETSNMP_SOURCE_ROOT)/built/include
+  NETSNMP_BINDIR = $(NETSNMP_SOURCE_ROOT)/built/bin
 else
   NETSNMP_LIBPATH = $(NETSNMP_BUILD_DIR)/lib
   NETSNMP_INCDIR = $(NETSNMP_BUILD_DIR)/include

ldap/cm/Makefile

@@ -451,7 +451,7 @@ endif
 # docs
 	-$(RM) -r $(RELDIR)/manual/en/slapd
 	-$(MKDIR) $(RELDIR)/manual/en/slapd
-	if [ -d $(DSDOC_DIR) ] ; then \
+	if [ $(DSDOC_DIR) -a -d $(DSDOC_DIR) ] ; then \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/help/*.* $(RELDIR)/manual/en/slapd/help ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.map $(RELDIR)/manual/en/slapd/ ; \
 	  $(INSTALL) -m 644 $(OBJDIR)/manual/slapd/index.htm $(RELDIR)/manual/en/slapd/ ; \