Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / include / Makefile.in

diff --git a/include/Makefile.in b/include/Makefile.in
index 91d8a5574134610aa17298ab2de2f0a95aaecacf..fad35189bef59d3014e80823ec740650d85c4525 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,17 +1,27 @@
+# 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-2013 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)
        for header in $(srcdir)/lber.h lber_types.h \
                $(srcdir)/ldap.h $(srcdir)/ldap_cdefs.h \
                $(srcdir)/ldap_schema.h $(srcdir)/ldap_utf8.h \
-               $(srcdir)/slapi-plugin.h ldap_features.h; \
+               $(srcdir)/slapi-plugin.h ldap_features.h \
+               $(srcdir)/ldif.h ; \
        do \
                $(INSTALL) $(INSTALLFLAGS) -m 644 $$header $(DESTDIR)$(includedir); \
        done
@@ -24,7 +34,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 +51,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 +61,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,13 +71,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_WHO=\"$$USER@`uname -n`\" $? > $@
-
 all-common:                    all-local
 install-common:                all-common install-local
 clean-common:          clean-local