From 641845f4c11dd5356815ce64a2ec1e4121a3bd16 Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 22 Sep 2000 19:16:53 +0000
Subject: [PATCH] Rework schema install to work with VPATH support

---
 build/top.mk              |  1 +
 servers/slapd/Makefile.in | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/build/top.mk b/build/top.mk
index e0ccfa308e..1660a74656 100644
--- 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 c2765718ac..ac2627eca6 100644
--- 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
-- 
2.39.5