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

diff --git a/include/Makefile.in b/include/Makefile.in
index 1a8fd9d35f..58bceb165f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,10 +1,19 @@
+# include Makefile.in for OpenLDAP
 # $OpenLDAP$
-## Copyright 1998-2003 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 ol_version0.h FORCE
+all-local: ldap_config.h FORCE
 
 install-local: FORCE
 	-$(MKDIR) $(DESTDIR)$(includedir)
@@ -24,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) $@
@@ -41,6 +50,8 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
 	    libexecdir=`cygpath -w $(libexecdir) | \
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
+	    moduledir=`cygpath -w $(moduledir) | \
+		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
 	    localstatedir=`cygpath -w $(localstatedir) | \
 		$(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
 	else \
@@ -49,7 +60,9 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
 	    bindir=$(bindir); \
 	    sbindir=$(sbindir); \
 	    libexecdir=$(libexecdir); \
+	    moduledir=$(moduledir); \
 	    localstatedir=$(localstatedir); \
+	    localedir=$(localedir); \
 	fi; \
 	$(SED) \
 			-e "s;%SYSCONFDIR%;$$sysconfdir;" \
@@ -57,14 +70,12 @@ 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;%LOCALEDIR%;$$localedir;" \
 			 $(LDAP_CONFIG) >> $@; \
 	$(CHMOD) 444 $@
 
-ol_version0.h: $(top_srcdir)/build/version.h
-	$(CPP) -D_OLV_PKG=\"$(PACKAGE)\" -D_OLV_VER=\"$(VERSION)\" \
-		-D_OLV_WHO=\"$$USER@`uname -n`\" $? > $@
-
 all-common:			all-local
 install-common:		all-common install-local
 clean-common:		clean-local