Add mkversion script to generate version.c files. mkversion generates

identification strings compatible with ident(1) and what(1).
Uses $(VERSION) generated from configure.in.  rm build/version
rm old version .c files

build/top.mk

@@ -44,6 +44,7 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 LINT = lint
 5LINT = 5lint
 MKDEP = $(top_srcdir)/build/mkdep $(MKDEPFLAG) -d "$(srcdir)" -c "$(CC)"
+MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 
 LIBTOOL = @LIBTOOL@
 LIBVERSION = 0:0:0
@@ -82,9 +83,6 @@ SENDMAIL = @SENDMAIL@
 MANCOMPRESS=$(CAT)
 MANCOMPRESSSUFFIX=
 
-# Version
-VERSIONFILE = $(top_srcdir)/build/version
-
 INCLUDEDIR= $(top_srcdir)/include
 LDAP_INCPATH= -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
 LDAP_LIBADIR= $(top_builddir)/libraries

build/version

@@ -1 +0,0 @@
-2.0-devel

clients/fax500/Makefile.in

@@ -19,20 +19,12 @@ fax500 : fax5version.o
 	$(LTLINK) -o $@ $(RPOBJS) fax5version.o $(LIBS)
 
 rpversion.c: ${RPOBJS} $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) rp500 > $@
-	    t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	    -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	    -e "s|%VERSION%|$${v}|" \
-	    < $(srcdir)/Versionrp.c > $@)
 
 fax5version.c: ${FAX5OBJS} $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) fax500 > $@
-	    t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	    -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	    -e "s|%VERSION%|$${v}|" \
-	    < $(srcdir)/Version.c > $@)
 
 xrpcomp.tmp: xrpcomp
 	$(SED) -e 's%\%LIBEXECDIR\%%$(libexecdir)%' $(srcdir)/xrpcomp > xrpcomp.tmp

clients/fax500/Version.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1993 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  fax500 v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/fax500/Versionrp.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1993 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  rp500 v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/finger/Makefile.in

@@ -13,12 +13,8 @@ in.xfingerd : version.o
 	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)
 
 version.c: ${OBJS} ${LDAP_LIBDEPEND}
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) in.xfingerd > $@
-	    t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	    -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	    -e "s|%VERSION%|$${v}|" \
-	    < $(srcdir)/Version.c > $@)
 
 install-local: $(PROGRAMS) FORCE
 	-$(MKDIR) $(libexecdir)

clients/finger/Version.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1991 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  in.xfingerd v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/gopher/Makefile.in

@@ -21,20 +21,12 @@ go500gw : gwversion.o
 	$(LTLINK) -o $@ $(GWOBJS) gwversion.o $(LIBS)
 
 goversion.c: ${GOOBJS} $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) go500 > $@
-	    t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	    -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	    -e "s|%VERSION%|$${v}|" \
-	    < $(srcdir)/Version.c > $@)
 
 gwversion.c: ${GWOBJS} $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) go500gw > $@
-	    t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	    -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	    -e "s|%VERSION%|$${v}|" \
-	    < $(srcdir)/Versiongw.c > $@)
 
 install-local: $(PROGRAMS) go500gw.help FORCE
 	-$(MKDIR) $(libexecdir) $(datadir)

clients/gopher/Version.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1991 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  go500 v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/gopher/Versiongw.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1991 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  go500gw 1.0 (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/mail500/Makefile.in

@@ -14,12 +14,8 @@ mail500 : version.o
 	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)
 
 version.c: ${OBJS} $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) mail500 > $@
-	    t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	    -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	    -e "s|%VERSION%|$${v}|" \
-	    < $(srcdir)/Version.c > $@)
 
 install-local: $(PROGRAMS) FORCE
 	-$(MKDIR) $(libexecdir)

clients/mail500/Version.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1991 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  mail500 v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/rcpt500/Makefile.in

@@ -14,12 +14,8 @@ rcpt500 : version.o
 	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)
 
 version.c: ${OBJS} $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) rcpt500 > $@
-	    t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	    -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	    -e "s|%VERSION%|$${v}|" \
-	    < $(srcdir)/Version.c > $@)
 
 install-local: $(PROGRAMS) rcpt500.help FORCE
 	-$(MKDIR) $(libexecdir) $(datadir)

clients/rcpt500/Version.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1992 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  rcpt500 v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/tools/Makefile.in

@@ -26,44 +26,32 @@ ldapdelete:	lddversion.o
 ldapmodrdn:	ldrversion.o
 	$(LTLINK) -o $@ ldapmodrdn.o ldrversion.o $(LIBS)
 
-ldappasswd:	ldappasswd.o
+ldappasswd:	ldpversion.o
-	$(LTLINK) -o $@ ldappasswd.o $(LIBS)
+	$(LTLINK) -o $@ ldappasswd.o ldpversion.o $(LIBS)
 
 ldapadd:	ldapmodify
-	$(RM) $@
+	@-$(RM) $@
 	$(LN_H) ldapmodify ldapadd
 
 ldsversion.c: ldapsearch.o $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) ldapsearch > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Versionlds.c > $@)
 
 ldmversion.c: ldapmodify.o $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) ldapmodify > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Versionldm.c > $@)
 
 lddversion.c: ldapdelete.o $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) ldapdelete > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
+
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
+ldpversion.c: ldappasswd.o $(LDAP_LIBDEPEND)
-	-e "s|%VERSION%|$${v}|" \
+	@-$(RM) $@
-	< $(srcdir)/Versionldd.c > $@)
+	$(MKVERSION) ldappasswd > $@
 
 ldrversion.c: ldapmodrdn.o $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) ldapmodrdn > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Versionldr.c > $@)
 
 install-local:	FORCE
 	-$(MKDIR) $(bindir)

clients/tools/Versionldd.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1994 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  ldapdelete v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/tools/Versionldm.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1994 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  ldapmodify v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/tools/Versionldr.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1994 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  ldapmodrdn v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/tools/Versionlds.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1994 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "  ldapsearch v%VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

clients/ud/Makefile.in

@@ -16,12 +16,8 @@ ud : version.o
 	$(LTLINK) -o $@ version.o $(OBJS) $(LIBS)
 
 version.c: ${OBJS} $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) ud > $@
-	    t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	    -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	    -e "s|%VERSION%|$${v}|" \
-	    < $(srcdir)/Version.c > $@)
 
 install-local: FORCE
 	-$(MKDIR) $(bindir)

clients/ud/Version.c

@@ -1,13 +0,0 @@
-/*
- * Copyright (c) 1991, 1992 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-char Version[] = "LDAP UserDirectory %VERSION% (%WHEN%)\n\t%WHOANDWHERE%\n";

configure.in

@@ -14,7 +14,9 @@ define([AC_CACHE_SAVE], )dnl
 dnl Configure.in for OpenLDAP
 AC_INIT(include/ldap.h)dnl
 AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel], [no ac_define])dnl
+AM_INIT_AUTOMAKE(OpenLDAP,[2.0-devel])dnl
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
 
 dnl We use autoconf features new to 2.13.
 dnl 	aclocal.m4 should be built using aclocal from automake 1.4

servers/ldapd/Makefile.in

@@ -33,11 +33,7 @@ sldapd:	version.o
 
 version.c: $(OBJS) $(LDAP_LIBLBER_DEPEND)
 	$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) ldapd > $@
-	 t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Version.c > $@)
 
 request.o:	LDAP-types.h
 

servers/slapd/Makefile.in

@@ -79,13 +79,9 @@ libbackends.a: .backend
 	@ls -l libbackends.a
 
 version.c: libbackends.a $(OBJS) $(SLAPD_LIBDEPEND) 
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) slapd > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
+	
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Version.c > $@)
-
 depend-local-srv: FORCE
 	@for i in back-* shell-backends tools; do \
 		if [ -d $$i ]; then \

servers/slapd/back-bdb2/Makefile.in

@@ -29,10 +29,5 @@ libback-bdb2.a:	version.o
 	@touch ../.backend
 
 version.c:	$(OBJS) $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` \
+	$(MKVERSION) back-bdb2 > $@
-	 h=`$(HOSTNAME)` t=`$(DATE)`; \
-	 $(SED) -e "s|%WHEN%|$${t}|" \
-		-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-		-e "s|%VERSION%|$${v}|" \
-		< $(srcdir)/Version.c > $@)

servers/slapd/back-ldbm/Makefile.in

@@ -27,10 +27,5 @@ libback-ldbm.a:	version.o
 	@touch ../.backend
 
 version.c:	$(OBJS) $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` \
+	$(MKVERSION) back-ldbm > $@
-	 h=`$(HOSTNAME)` t=`$(DATE)`; \
-	 $(SED) -e "s|%WHEN%|$${t}|" \
-		-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-		-e "s|%VERSION%|$${v}|" \
-		< $(srcdir)/Version.c > $@)

servers/slapd/back-passwd/Makefile.in

@@ -21,10 +21,6 @@ libback-passwd.a:	version.o
 	@touch ../.backend
 
 version.c: $(OBJS) $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) back-passwd > $@
-	 t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Version.c > $@)
 

servers/slapd/back-perl/Makefile.in

@@ -35,10 +35,5 @@ libback-perl.a:	version.o
 	@touch ../.backend
 
 version.c: $(OBJS) $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) back-perl > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Version.c > $@)
-

servers/slapd/back-shell/Makefile.in

@@ -23,10 +23,6 @@ libback-shell.a:	version.o
 	@touch ../.backend
 
 version.c: $(OBJS) $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) back-shell > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Version.c > $@)
 

servers/slapd/back-tcl/Makefile.in

@@ -36,10 +36,6 @@ libback-tcl.a:	version.o
 	@touch ../.backend
 
 version.c: $(OBJS) $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) back-tcl > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Version.c > $@)
 

servers/slapd/shell-backends/Makefile.in

@@ -16,9 +16,5 @@ passwd-shell:	pwd-version.o
 	$(CC) $(LDFLAGS) -o $@ $(OBJS) pwd-version.o $(LIBS)
 
 pwd-version.c: $(OBJS) $(LDAP_LIBDEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) passwd-shell > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/pwd-Version.c > $@)

servers/slapd/tools/Makefile.in

@@ -80,12 +80,8 @@ edb2ldif:	edb2-vers.o
 	$(CC) $(LDFLAGS) -o $@ $(EDB2LDIFOBJS) edb2-vers.o $(LIBS)
 
 edb2-vers.c: $(EDB2LDIFOBJS)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) ebd2ldif > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< Vers-edb2.c > $@)
 
 build-chlog2replog: FORCE
 	@if [ "$(HAVE_ISODE)" = "yes" ]; then \

servers/slurpd/Makefile.in

@@ -34,12 +34,8 @@ sslurpd:	version.o
 	$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
 
 version.c: $(OBJS) $(LDAP_LIBDEPEND) $(LDAP_LIBTHREAD_DEPEND)
-	$(RM) $@
+	@-$(RM) $@
-	(u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
+	$(MKVERSION) slurpd > $@
-	t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-	-e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-	-e "s|%VERSION%|$${v}|" \
-	< $(srcdir)/Version.c > $@)
 
 install-local-srv: FORCE
 	@-$(MKDIR) $(libexecdir)