Pulled NetBSD changes into current

diff --git a/include/Make-template b/include/Make-template
index 7c59838fb5855479ba5dd5e79f77de582a1d22a4..8244b1a630b7847344dede780c684a9a4859a989 100644 (file)
--- a/include/Make-template
+++ b/include/Make-template
@@ -43,7 +43,7 @@ ldapconfig.h: ldapconfig.h.edit Makefile
        $(CHMOD) 444 $@
 
 install: all FORCE
-               -$(MKDIR) -p $(INCLUDEDIR)
+               -$(MKDIR) -p $(LDAP_INCDIR)
                $(INSTALL) $(INSTALLFLAGS) -m 644 ldap.h $(LDAP_INCDIR)
                $(INSTALL) $(INSTALLFLAGS) -m 644 lber.h $(LDAP_INCDIR)
                $(INSTALL) $(INSTALLFLAGS) -m 644 proto-lber.h $(LDAP_INCDIR)

diff --git a/include/portable.h b/include/portable.h
index 8d08f6feff41d1a5c1859db1bbb787dd4fab44e9..808d0c023767adde601912133e6007de186d3f7d 100644 (file)
--- a/include/portable.h
+++ b/include/portable.h
@@ -120,7 +120,8 @@
  * Are sys_errlist and sys_nerr declared in stdio.h?
  */
 #ifndef SYSERRLIST_IN_STDIO
-#if defined( freebsd ) || defined( __GLIBC__ ) && ( __GLIBC__ > 1 )
+#if defined( freebsd ) || defined( netbsd ) || \
+       defined( __GLIBC__ ) && ( __GLIBC__ > 1 )
 #define SYSERRLIST_IN_STDIO
 #endif
 #endif