Rework schema install to work with VPATH support

diff --git a/build/top.mk b/build/top.mk
index e0ccfa308e6de4b15a1d856b3b3e18672d8eb771..1660a746561acb9e53fb6f51e52f4f46cec9f2d4 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -34,6 +34,7 @@ moduledir = @libexecdir@$(ldap_subdir)
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@$(ldap_subdir)
+schemadir = $(sysconfdir)/schema
 
 EXEEXT = @EXEEXT@
 OBJEXT = @OBJEXT@

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index c2765718acd3c4b566b0db57f807891fa467aaf0..ac2627eca6a882be1125506a9bcf505c1853545f 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -251,17 +251,17 @@ all-cffiles: slapd
        touch all-cffiles
 
 install-schema: FORCE
-       @-$(MKDIR) $(DESTDIR)$(sysconfdir)/schema
-       @cd $(srcdir) ; \
-       for i in schema/*.schema ; do \
-               if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
-                       echo "installing $$i in $(sysconfdir)"; \
-                       echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(sysconfdir)/$$i; \
-                       $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(sysconfdir)/$$i; \
+       @-$(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; \
                else \
-                       echo "PRESERVING EXISTING SCHEMA FILE $(DESTDIR)$(sysconfdir)/$$i"; \
+                       echo "PRESERVING EXISTING SCHEMA FILE $(DESTDIR)$(schemadir)/$$i"; \
                fi; \
-               $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(sysconfdir)/$$i.default ; \
+               $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(schemadir)/$$i.default ; \
        done
 
 install-conf: FORCE