Use OPENLDAP_PACKAGE (from portable.h) instead of _OLV_PKG, etc.

build/top.mk

@@ -170,6 +170,7 @@ AC_CFLAGS = @CFLAGS@
 AC_DEFS = @CPPFLAGS@ # @DEFS@
 AC_LDFLAGS = @LDFLAGS@
 AC_LIBS = @LIBS@
+CWD_DEF = -D_OLV_CWD=\"`pwd`\"
 
 KRB4_LIBS = @KRB4_LIBS@
 KRB5_LIBS = @KRB5_LIBS@

build/version.h

@@ -9,5 +9,5 @@ static const char copyright[] =
 "COPYING RESTRICTIONS APPLY\n";
 
 _OLV_STATIC const char __Version[] =
-"@(#) $" _OLV_PKG ": " _OLV_APP " " _OLV_VER " (" _OLV_DATE " " _OLV_TIME ") $\n\t" _OLV_WHO ":" _OLV_CWD "\n";
+"@(#) $" OPENLDAP_PACKAGE ": " _OLV_APP " " OPENLDAP_VERSION " (" _OLV_DATE " " _OLV_TIME ") $\n\t" _OLV_WHO ":" _OLV_CWD "\n";