Fix schema install

Update versioning information for 2.0.6

diff --git a/CHANGES b/CHANGES
index 4c33587d6218450d7c4349fd8fe09e44a2953ef8..412f8236a58aa893d5cabebecc810737bf05b90a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
 OpenLDAP 2.0 Change Log
 
-OpenLDAP 2.0.x Engineering
+OpenLDAP 2.0.6 Engineering
        Build Environment
+               Fixed schema install (ITS#802)
                Added libtool customizations
-               Enabled module support
+               Re-enabled module support
        Documentation
                Update ldapsearch(1)
 

diff --git a/build/version b/build/version
index 9a664840739a3abf32632238bc66b523fba31f6a..3ea07d065ba813b7d417dc7f1f1cc371c0719ed3 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-2.0.x-Engineering
+2.0.6-Release

diff --git a/include/ldap.h b/include/ldap.h
index 3f2b108f364036674a66bfa5fe3a46b2b6d93a01..040edd64008ba5780ee4248fd794b205bcbf4d42 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -48,7 +48,7 @@ LDAP_BEGIN_DECL
  *     2.0.0  -> 20000
  *     2.3.16 -> 20316
  */
-#define LDAP_VENDOR_VERSION    20005
+#define LDAP_VENDOR_VERSION    20006
 
 /* OpenLDAP API Features */
 #define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index ed5f06487b2f0f10117a7989a63e63524d71bb8a..1ac13d1fb5201fea5a62cefcbd5d4d700fb39378 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -101,8 +101,7 @@ slapd.def: $(OBJS) version.o
 # We don't want to include symbols from dynamic libraries.
 all.def: $(STATIC_DEFS) $(DYNAMIC_DEFS)
        cat $(STATIC_DEFS) | grep " @ " | sed -e 's/ @ [0-9]*//' > $@
-       if [ "@LIB_LINKAGE@" != "DYN" ] ; \
-       then \
+       if test "@LIB_LINKAGE@" != "DYN" ; then \
            cat $(DYNAMIC_DEFS) | grep " @ " | sed -e 's/ @ [0-9]*//' >> $@; \
        fi
        echo EXPORTS > tmp.def
@@ -160,7 +159,7 @@ sslapd: version.o
 
 .backend: $(@PLAT@_IMPLIB) FORCE
        @for i in back-*; do \
-               if [ -d $$i -a -f $$i/Makefile ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo " "; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) all ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -186,7 +185,7 @@ libbackends.a: .backend
        done
        @mv -f tmp/libbackends.a ./libbackends.a
        @$(RM) -r tmp
-       @if [ ! -z "$(RANLIB)" ]; then \
+       @if test ! -z "$(RANLIB)" ; then \
                $(RANLIB) libbackends.a; \
        fi
        @ls -l libbackends.a
@@ -197,7 +196,7 @@ version.c: $(OBJS) $(SLAPD_LIBDEPEND)
 
 depend-local-srv: FORCE
        @for i in back-* shell-backends tools; do \
-               if [ -d $$i -a -f $$i/Makefile ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -210,7 +209,7 @@ clean-local:
 
 clean-local-srv: FORCE
        @for i in back-* shell-backends tools; do \
-               if [ -d $$i -a -f $$i/Makefile ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -220,7 +219,7 @@ clean-local-srv: FORCE
 
 veryclean-local-srv: FORCE
        @for i in back-* shell-backends tools; do \
-               if [ -d $$i -a -f $$i/Makefile ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
                fi; \
@@ -233,9 +232,9 @@ install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(localstatedir)
        $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
                slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
-       @if [ ! -z "$(SLAPD_MODULES)" ]; then \
+       @if test ! -z "$(SLAPD_MODULES)" ; then \
            for i in back-* shell-backends tools; do \
-               if [ -d $$i -a -f $$i/Makefile ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) install ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -252,16 +251,17 @@ all-cffiles: slapd
 
 install-schema: FORCE
        @-$(MKDIR) $(DESTDIR)$(schemadir)
-       @cd $(srcdir)/schema ; \
-       for i in *.schema ; do \
-               if test ! -f $(DESTDIR)$(schemadir)/$$i; then \
-                       echo "installing $$i in $(schemadir)"; \
-                       echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(schemadir)/$$i; \
-                       $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(schemadir)/$$i; \
+       for i in $(srcdir)/schema/*.schema ; do \
+               SF=`basename $$i` ; \
+               SD="$(DISTDIR)$(schemadir)/$$SF" ; \
+               if test ! -f $$SD ; then \
+                       echo "installing $$SF in $(schemadir)" ; \
+                       echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \
+                       $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \
                else \
-                       echo "PRESERVING EXISTING SCHEMA FILE $(DESTDIR)$(schemadir)/$$i"; \
-               fi; \
-               $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(schemadir)/$$i.default ; \
+                       echo "PRESERVING EXISTING SCHEMA FILE $$SD" ; \
+               fi ; \
+               $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD.default ; \
        done
 
 install-conf: FORCE