X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2FMakefile.in;h=58bceb165f30511e54ee834b68c3b57803466a0c;hb=8fef28c0592e1c833ac1e3877493539a65cfc8de;hp=f93ba38f44465471dd34f930e30a5f2312a3ca81;hpb=0552b1c53fa44790811f44cac5e14fc52fbd2ace;p=openldap

diff --git a/include/Makefile.in b/include/Makefile.in
index f93ba38f44..58bceb165f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,8 +1,17 @@
+# include Makefile.in for OpenLDAP
 # $OpenLDAP$
-## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, See COPYRIGHT file
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## include Makefile.in for OpenLDAP
+## Copyright 1998-2010 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 all-local: ldap_config.h FORCE
 
@@ -11,8 +20,7 @@ install-local: FORCE
 	for header in $(srcdir)/lber.h lber_types.h \
 		$(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \
 		$(srcdir)/ldap_schema.h $(srcdir)/ldap_utf8.h \
-		ldap_features.h \
-		$(srcdir)/disptmpl.h $(srcdir)/srchpref.h; \
+		$(srcdir)/slapi-plugin.h ldap_features.h; \
 	do \
 		$(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
 	done
@@ -25,7 +33,7 @@ veryclean-local: clean-local FORCE
 
 depend-local: ldap_config.h FORCE
 
-LDAP_CONFIG=$(srcdir)/ldap_config.h.in
+LDAP_CONFIG=$(srcdir)/ldap_config.hin
 
 ldap_config.h: $(LDAP_CONFIG) Makefile
 	@$(RM) $@
@@ -42,13 +50,9 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
 	    libexecdir=`cygpath -w $(libexecdir) | \
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-	    localstatedir=`cygpath -w $(localstatedir) | \
-		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-	    editor=`cygpath -w $(EDITOR) | \
-		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-	    finger=`cygpath -w $(FINGER) | \
+	    moduledir=`cygpath -w $(moduledir) | \
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-	    sendmail=`cygpath -w $(SENDMAIL) | \
+	    localstatedir=`cygpath -w $(localstatedir) | \
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
 	else \
 	    sysconfdir=$(sysconfdir); \
@@ -56,10 +60,9 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
 	    bindir=$(bindir); \
 	    sbindir=$(sbindir); \
 	    libexecdir=$(libexecdir); \
+	    moduledir=$(moduledir); \
 	    localstatedir=$(localstatedir); \
-	    editor=$(EDITOR); \
-	    finger=$(FINGER); \
-	    sendmail=$(SENDMAIL); \
+	    localedir=$(localedir); \
 	fi; \
 	$(SED) \
 			-e "s;%SYSCONFDIR%;$$sysconfdir;" \
@@ -67,10 +70,9 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
 			-e "s;%BINDIR%;$$bindir;" \
 			-e "s;%SBINDIR%;$$sbindir;" \
 			-e "s;%LIBEXECDIR%;$$libexecdir;" \
+			-e "s;%MODULEDIR%;$$moduledir;" \
 			-e "s;%RUNDIR%;$$localstatedir;" \
-			-e "s;%EDITOR%;$$editor;" \
-			-e "s;%FINGER%;$$finger;" \
-			-e "s;%SENDMAIL%;$$sendmail;" \
+			-e "s;%LOCALEDIR%;$$localedir;" \
 			 $(LDAP_CONFIG) >> $@; \
 	$(CHMOD) 444 $@