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

diff --git a/build/top.mk b/build/top.mk
index 32de10d5a22eb9b26af385eaec87ed63b4494882..60cbc4e0136749eac67d544f3b50a77a5dde8195 100644 (file)
--- a/build/top.mk
+++ b/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@

diff --git a/build/version.h b/build/version.h
index 058c1cee2b0ba1ee1cf89ebcc285d6c0c942bb17..800a7fcf814140f14cb58ead8ea4534bb8455029 100644 (file)
--- a/build/version.h
+++ b/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";