ITS#5215

diff --git a/CHANGES b/CHANGES
index fccc667e319dabdda8ac2c8308c8fa43a99dfe0c..8df37a56a5c7bf74fc6629f1083f70574357b792 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ OpenLDAP 2.4.7 Engineering
        Updated contrib addpartial module (ITS#3593)
        Build Environment
                Fixed liblber socket library linking (ITS#5224)
+               Fixed Windows slapd.def rules (ITS#5215)
        Documentation
                Fixed grammar errors (ITS#5223)
                Refint overlay doc contribution (ITS#5217)

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index fcc9a4ce83050225027d316650e06131e27fbda1..2131b4e048a1a565dad576ae42ea5f6cd52ae6e6 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -138,7 +138,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
 # for functions, but it is required for variables.
 #
 # The symdummy.c file basically references EVERY symbol available to slapd.exe,
-# including symbols that slapd.exe never actually refereneced. The file
+# including symbols that slapd.exe never actually referenced. The file
 # is compiled and included at link time. Without this object file, slapd.exe
 # would NOT export symbols that it never referenced. The reason that these
 # symbols must still be exported is because a dynamic module may want to
@@ -155,7 +155,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
 # on its own very long list of dependencies.
 #
 slapd.def: libbackends.a liboverlays.a version.o
-       @for i in $(LDFLAGS) ; do \
+       @for i in XX $(LDFLAGS) ; do \
            path=`expr "$$i" : "-L\(.*\)"`; \
            if test $$? != 0; then continue; fi; \
            paths="$$paths $$path"; \
@@ -167,7 +167,7 @@ slapd.def: libbackends.a liboverlays.a version.o
                -l*) \
                    done="" ;\
                    base=`expr "$$i" : "-l\(.*\)"`; \
-                   for p in $$paths ; do \
+                   for p in . $$paths ; do \
                        for ext in la dll dll.a a ; do \
                            path=$$p/lib$$base.$$ext; \
                            test ! -f $$path && continue; \