Use OPENLDAP_PACKAGE instead of _OLV_PKG

[openldap] / include / Makefile.in

diff --git a/include/Makefile.in b/include/Makefile.in
index f93ba38f44465471dd34f930e30a5f2312a3ca81..91d8a5574134610aa17298ab2de2f0a95aaecacf 100644 (file)
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,18 +1,17 @@
 # $OpenLDAP$
-## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, See COPYRIGHT file
 ##
 ## include Makefile.in for OpenLDAP
 
-all-local: ldap_config.h FORCE
+all-local: ldap_config.h ol_version0.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 \
-               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
@@ -44,12 +43,6 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
                $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
            localstatedir=`cygpath -w $(localstatedir) | \
                $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-           editor=`cygpath -w $(EDITOR) | \
-               $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-           finger=`cygpath -w $(FINGER) | \
-               $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
-           sendmail=`cygpath -w $(SENDMAIL) | \
-               $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \
        else \
            sysconfdir=$(sysconfdir); \
            datadir=$(datadir); \
@@ -57,9 +50,6 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
            sbindir=$(sbindir); \
            libexecdir=$(libexecdir); \
            localstatedir=$(localstatedir); \
-           editor=$(EDITOR); \
-           finger=$(FINGER); \
-           sendmail=$(SENDMAIL); \
        fi; \
        $(SED) \
                        -e "s;%SYSCONFDIR%;$$sysconfdir;" \
@@ -68,12 +58,12 @@ ldap_config.h: $(LDAP_CONFIG) Makefile
                        -e "s;%SBINDIR%;$$sbindir;" \
                        -e "s;%LIBEXECDIR%;$$libexecdir;" \
                        -e "s;%RUNDIR%;$$localstatedir;" \
-                       -e "s;%EDITOR%;$$editor;" \
-                       -e "s;%FINGER%;$$finger;" \
-                       -e "s;%SENDMAIL%;$$sendmail;" \
                         $(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