Fix VPATH includes/libraries

diff --git a/build/top.mk b/build/top.mk
index 46d81b73229fd164993cf0a2dcc66fa3683ac811..6cec0b0369119788b29d2b131d03ac3c99e76b96 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -59,10 +59,12 @@ SENDMAIL = @SENDMAIL@
 # Version
 VERSIONFILE = $(top_srcdir)/build/version
 
-INCLUDEDIR = -I$(top_srcdir)/include
+INCLUDEDIR = $(top_srcdir)/include
+LDAP_INCPATH = -I$(LDAP_INCDIR) -I$(INCLUDEDIR)
+LDAP_LIBPATH = -L$(LDAP_LIBDIR)
 
-LDAP_LIBS = -lldif -lldap -llber
-LDAP_LIBDEPEND = $(VLIBDIR)/libldif.a $(VLIBDIR)/libldap.a $(VLIBDIR)/liblber.a
+LDAP_LIBS = $(LDAP_LIBPATH) -lldif -lldap -llber
+LDAP_LIBDEPEND = $(LDAP_LIBDIR)/libldif.a $(LDAP_LIBDIR)/libldap.a $(LDAP_LIBDIR)/liblber.a
 
 # AutoConfig generated 
 AC_CC  = @CC@
@@ -75,8 +77,8 @@ LIBTERMCAP = @LIBTERMCAP@
 
 # Our Defaults
 CC = $(AC_CC)
-DEFS = $(LDAP_DEFS) $(VINCLUDEDIR) $(INCLUDEDIR) $(XDEFS) $(AC_DEFS) 
-LIBS = $(VLIBS) $(LDAP_LIBS) $(XLIBS) $(AC_LIBS)
+DEFS = $(LDAP_DEFS) $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) 
+LIBS = $(LDAP_LIBS) $(XLIBS) $(AC_LIBS)
 
 CFLAGS = $(AC_CFLAGS) $(DEFS) $(DEFINES)
 LDFLAGS = $(AC_LDFLAGS)

diff --git a/clients/fax500/Makefile.in b/clients/fax500/Makefile.in
index 85da96cde5581198260051031ac65d6ead7a37c4..302d1c93aa97f2f17738ba7620b3d03e28a84721 100644 (file)
--- a/clients/fax500/Makefile.in
+++ b/clients/fax500/Makefile.in
@@ -1,12 +1,13 @@
+PROGRAMS= rp500 fax500
+
 SRCS= main.c faxtotpc.c rp500.c
 XSRCS=fax5version.c rpversion.c
+
 FAX5OBJS = main.o faxtotpc.o
 RPOBJS =  rp500.o faxtotpc.o
-PROGRAMS= rp500 fax500
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
 
+LDAP_INCDIR= ../../include
+LDAP_LIBDIR= ../../libraries
 
 rp500 : rpversion.o
        $(CC) $(LDFLAGS) -o $@ $(RPOBJS) rpversion.o $(LIBS)
@@ -34,6 +35,6 @@ install: $(PROGRAMS) xrpcomp FORCE
        -$(MKDIR) -p $(libexecdir)
        $(INSTALL) $(INSTALLFLAGS) -m 755 rp500 $(libexecdir)
        $(INSTALL) $(INSTALLFLAGS) -m 755 fax500 $(libexecdir)
-       $(SED) -e 's%LIBEXECDIR%$(libexecdir)%' xrpcomp > /tmp/xrpcomp.tmp
+       $(SED) -e 's%LIBEXECDIR%$(libexecdir)%' $(srcdir)/xrpcomp > /tmp/xrpcomp.tmp
        $(INSTALL) $(INSTALLFLAGS) -m 755 /tmp/xrpcomp.tmp $(libexecdir)/xrpcomp
        $(RM) /tmp/xrpcomp.tmp

diff --git a/clients/finger/Makefile.in b/clients/finger/Makefile.in
index 10f2c34e9950d722c1eea805dc6e67f6b405836f..951d5684b4f4fd67e8cbddf43742854b41dda0a1 100644 (file)
--- a/clients/finger/Makefile.in
+++ b/clients/finger/Makefile.in
@@ -2,9 +2,9 @@ SRCS=   main.c
 XSRCS= version.c
 OBJS=  main.o
 PROGRAMS= in.xfingerd
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
+
+LDAP_INCDIR= ../../include
+LDAP_LIBDIR= ../../libraries
 
 in.xfingerd : version.o
        $(CC) $(LDFLAGS) -o $@ version.o $(OBJS) $(LIBS)

diff --git a/clients/gopher/Makefile.in b/clients/gopher/Makefile.in
index 728229170cd9da7343a4e82d134e36a159226f16..d6f4aacf8e367635d894da37d0e40491fc9abf35 100644 (file)
--- a/clients/gopher/Makefile.in
+++ b/clients/gopher/Makefile.in
@@ -8,9 +8,9 @@ XSRCS= gwversion.o goversion.o
 GOOBJS =  go500.o detach.o setproctitle.o
 GWOBJS =  go500gw.o detach.o setproctitle.o
 
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
+LDAP_INCDIR= ../../include
+LDAP_LIBDIR= ../../libraries
+
 
 go500 : goversion.o
        $(CC) $(LDFLAGS) -o $@ $(GOOBJS) goversion.o $(LIBS)

diff --git a/clients/mail500/Makefile.in b/clients/mail500/Makefile.in
index ae040c10ef1248e4f49786ff5e6ce339c7ce7e46..53bee9af94dde6513be11c61f70f22c6010b357c 100644 (file)
--- a/clients/mail500/Makefile.in
+++ b/clients/mail500/Makefile.in
@@ -4,9 +4,8 @@ SRCS=   main.c
 XSRCS= version.c
 OBJS=  main.o
 
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
+LDAP_INCDIR= ../../include
+LDAP_LIBDIR= ../../libraries
 
 mail500 : version.o
        $(CC) $(LDFLAGS) -o $@ version.o $(OBJS) $(LIBS)

diff --git a/clients/rcpt500/Makefile.in b/clients/rcpt500/Makefile.in
index 76c2e088d8637744c39d06acd471cbde87de4943..ba6654270af5a8dcfd1862d9674c0b98295e5789 100644 (file)
--- a/clients/rcpt500/Makefile.in
+++ b/clients/rcpt500/Makefile.in
@@ -4,9 +4,8 @@ XSRCS= version.c
 OBJS= main.o cmds.o help.o query.o
 HDRS= rcpt500.h
 
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
 
 rcpt500 : version.o
        $(CC) $(LDFLAGS) -o $@ version.o $(OBJS) $(LIBS)

diff --git a/clients/tools/Makefile.in b/clients/tools/Makefile.in
index e95894e29edadd5c071c02d1318a8a33eb8e8c62..9133a264107d77ee29a375d7dc585731ec794962 100644 (file)
--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -5,9 +5,8 @@ SRCS    = ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c
 OBJS   = ldapsearch.o ldapmodify.o ldapdelete.o ldapmodrdn.o
 XLIBS  = -llber -lldap
 
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
 
 XSRCS  = ldsversion.c ldmversion.c lddversion.c ldrversion.c
 

diff --git a/clients/ud/Makefile.in b/clients/ud/Makefile.in
index e62e301e0a8b464c05da45454f338a74af362a43..e68ca716bfae4e09c7f1b1acd87fc15a78a692db 100644 (file)
--- a/clients/ud/Makefile.in
+++ b/clients/ud/Makefile.in
@@ -6,9 +6,8 @@ OBJS=   main.o find.o mod.o print.o auth.o util.o help.o \
 HDRS=  ud.h
 PROGRAMS= ud
 
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
 
 XLIBS = $(LIBTERMCAP)
 

diff --git a/libraries/libavl/Makefile.in b/libraries/libavl/Makefile.in
index 367a17887ee2d8ddfbf52e1456a79d16e5e3a102..7dca5eb04b134b78a13aada9a512ce233c8cfd45 100644 (file)
--- a/libraries/libavl/Makefile.in
+++ b/libraries/libavl/Makefile.in
@@ -6,6 +6,9 @@ SRCS = avl.c testavl.c
 XSRCS = version.c
 OBJS = avl.o
 
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+
 LIBRARY = libavl.a
 XPROGRAMS      = testavl
 

diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index bfcfce10939bf706a3c5449cfa8ec5f10e76f725..1a93680fb903da77e05e36a0ab89baa6af9b7a21 100644 (file)
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -6,6 +6,9 @@ SRCS = decode.c encode.c io.c bprint.c
 OBJS = decode.o encode.o io.o bprint.o
 XSRCS = version.c
 
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+
 LIBRARY = liblber.a
 
 install-local: $(LIBRARY) FORCE

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index e4a5f354449f97db660805f532f29a1c0519c126..3edc52875472be55d82d1b27320d82f6bcca0ea8 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -3,9 +3,10 @@
 ##
 LIBRARY = libldap.a
 PROGRAMS = ltest ttest
-VINCLUDEDIR = -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L(VLIBDIR)
+
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+
 
 SRCS   = bind.c open.c result.c error.c compare.c search.c \
        modify.c add.c modrdn.c delete.c abandon.c ufn.c cache.c \

diff --git a/libraries/libldbm/Makefile.in b/libraries/libldbm/Makefile.in
index 4ef12dd410a68a7a39b2e0df2cac2bf0c0789920..34cead14cce431dd5931e829306bfbe50c8b48f2 100644 (file)
--- a/libraries/libldbm/Makefile.in
+++ b/libraries/libldbm/Makefile.in
@@ -7,10 +7,11 @@ XPROGRAMS     = testldbm
 SRCS           = ldbm.c
 OBJS           = ldbm.o
 
-XDEFS          = @LDBM_DEFS@
-XLIBS          = @LDBM_LIBS@
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
 
-LIBS = -L$(LDAP_LIBDIR) -lavl $(AC_LIBS)
+XDEFS          = @LDBM_DEFS@
+XLIBS          = @LDBM_LIBS@ -lavl
 
 testldbm:      libldbm.a testldbm.o
        $(CC) $(LDFLAGS) -o $@ testldbm.o $(LIBS)

diff --git a/libraries/libldif/Makefile.in b/libraries/libldif/Makefile.in
index 6881b0707c8f4ba4afb37d4ab77e5951625f9ce8..c1560a31b4d93defb8678f099e47b7e64c905657 100644 (file)
--- a/libraries/libldif/Makefile.in
+++ b/libraries/libldif/Makefile.in
@@ -5,3 +5,7 @@
 LIBRARY        = libldif.a
 SRCS   = line64.c
 OBJS   = line64.o
+
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+

diff --git a/libraries/liblthread/Makefile.in b/libraries/liblthread/Makefile.in
index 9b12990e6ee2b5b763df6634bba98e165ec06235..47a810bd62d9b6275ba2a33fb26040af233263b5 100644 (file)
--- a/libraries/liblthread/Makefile.in
+++ b/libraries/liblthread/Makefile.in
@@ -7,5 +7,10 @@ XSRCS  = version.c
 SRCS   = thread.c stack.c
 OBJS   = thread.o stack.o
 
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+
 XDEFS  = @LTHREAD_DEFS@
 XLIBS  = @LTHREAD_LIBS@
+
+

diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in
index 0cdbed7239358fea5a75a308bda4917f88644576..e4cd68314c434be08da1cf3df8cf4fbd131cc76f 100644 (file)
--- a/libraries/liblutil/Makefile.in
+++ b/libraries/liblutil/Makefile.in
@@ -6,4 +6,7 @@ LIBRARY = liblutil.a
 SRCS   = base64.c md5.c sha1.c
 OBJS   = base64.o md5.o sha1.o
 
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+
 XDEFS  = @LUTIL_DEFS@

diff --git a/servers/ldapd/Makefile.in b/servers/ldapd/Makefile.in
index b8c2f7d37b0e8d9fdabef92249a79a51f38234eb..79610e878faef413be8a5bc6553f8811d7c9e598 100644 (file)
--- a/servers/ldapd/Makefile.in
+++ b/servers/ldapd/Makefile.in
@@ -11,9 +11,8 @@ OBJS  = main.o detach.o setproctitle.o request.o bind.o result.o error.o \
        abandon.o syntax.o association.o kerberos.o LDAP_tables.o \
        certificate.o
 
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
 
 BUILD_OPT = "--enable-ldapd"
 BUILD_SRV = @BUILD_LDAPD@

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 6055a1ca6942deac79e90739ea27f8857032e136..af4289e7629d20f36a1cfc455a7df4834176c2e1 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -18,9 +18,8 @@ OBJS  = main.o daemon.o connection.o search.o filter.o add.o charray.o \
                detach.o strdup.o tempnam.o repl.o lock.o \
                schema.o schemaparse.o monitor.o configinfo.o
 
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
+LDAP_INCDIR= ../../include
+LDAP_LIBDIR= ../../libraries
 
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
@@ -70,7 +69,7 @@ libbackends.a: .backend
        fi
        @ls -l libbackends.a
 
-version.c: libbackends.a $(OBJS) \
+version.c: libbackends.a $(OBJS) $(LDAP_LIBDEPEND) \
                $(LDAP_LIBDIR)/liblber.a \
                $(LDAP_LIBDIR)/liblldbm.a \
                $(LDAP_LIBDIR)/liblavl.a \

diff --git a/servers/slapd/back-ldbm/Makefile.in b/servers/slapd/back-ldbm/Makefile.in
index 825bb02540c7eacff5c5770c83fea04b7d89bbca..00a29c73ce8ef079d56292e13e488311fb803b9a 100644 (file)
--- a/servers/slapd/back-ldbm/Makefile.in
+++ b/servers/slapd/back-ldbm/Makefile.in
@@ -7,12 +7,13 @@ OBJS  = idl.o add.o search.o cache.o dbcache.o dn2id.o id2entry.o \
                modify.o modrdn.o delete.o init.o config.o bind.o attr.o \
                filterindex.o unbind.o kerberos.o close.o
 
-VINCLUDEDIR= -I../../../include -I$(srcdir)/..
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
 
 BUILD_OPT = "--enable-ldbm"
 BUILD_SRV = @BUILD_LDBM@
 
-XINCLUDEDIR = -I..
+XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = @SLAPD_DEFS@ @LDBM_DEFS@ @LTHREAD_DEFS@ @LUTIL_DEFS@
 
 PROGRAMS = libback-ldbm.a
@@ -25,7 +26,7 @@ libback-ldbm.a:       version.o
        @$(RANLIB) $@
        @touch ../.backend
 
-version.c:     $(OBJS)
+version.c:     $(OBJS) $(LDAP_LIBDEPEND)
        $(RM) $@
        (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` \
         h=`$(HOSTNAME)` t=`$(DATE)`; \

diff --git a/servers/slapd/back-passwd/Makefile.in b/servers/slapd/back-passwd/Makefile.in
index 183ede5186f0ad9c4ee8aa9d01cc152c41f67695..577f50daf7d8b8d5e2704b489a28b218d03ec1e0 100644 (file)
--- a/servers/slapd/back-passwd/Makefile.in
+++ b/servers/slapd/back-passwd/Makefile.in
@@ -1,13 +1,15 @@
 SRCS   = search.c config.c
 OBJS   = search.o config.o
 
-VINCLUDEDIR= -I../../../include
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
 
 BUILD_OPT = "--enable-passwd"
 BUILD_SRV = @BUILD_PASSWD@
 
 PROGRAMS= libback-passwd.a
-XINCLUDEDIR= -I..
+
+XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = @LTHREAD_DEFS@
 
 all-local:     FORCE   
@@ -18,7 +20,7 @@ libback-passwd.a:     version.o
        @$(RANLIB) $@
        @touch ../.backend
 
-version.c: $(OBJS)
+version.c: $(OBJS) $(LDAP_LIBDEPEND)
        $(RM) $@
        (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
         t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \

diff --git a/servers/slapd/back-shell/Makefile.in b/servers/slapd/back-shell/Makefile.in
index b63e7143a3f55c960db31d3fa84891955b9a7230..f3e1f3e53b406ece10b4fdba3745e16d853d6ae9 100644 (file)
--- a/servers/slapd/back-shell/Makefile.in
+++ b/servers/slapd/back-shell/Makefile.in
@@ -3,13 +3,15 @@ SRCS  = init.c config.c fork.c search.c bind.c unbind.c add.c delete.c \
 OBJS   = init.o config.o fork.o search.o bind.o unbind.o add.o delete.o \
                modify.o modrdn.o compare.o abandon.o result.o
 
-VINCLUDEDIR= -I../../../include
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
 
 BUILD_OPT = "--enable-shell"
 BUILD_SRV = @BUILD_SHELL@
 
 PROGRAMS =             libback-shell.a
-XINCLUDEDIR =  -I..
+
+XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = @LTHREAD_DEFS@
 
 all-local:     FORCE
@@ -20,7 +22,7 @@ libback-shell.a:      version.o
        @$(RANLIB) $@
        @touch ../.backend
 
-version.c: $(OBJS)
+version.c: $(OBJS) $(LDAP_LIBDEPEND)
        $(RM) $@
        (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
        t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \

diff --git a/servers/slapd/shell-backends/Makefile.in b/servers/slapd/shell-backends/Makefile.in
index 76b4e0374a358087b9b489615d1940778a68e7b9..aab59ca8fcfdaa47867aaeacd111d5ff045ec6f2 100644 (file)
--- a/servers/slapd/shell-backends/Makefile.in
+++ b/servers/slapd/shell-backends/Makefile.in
@@ -4,12 +4,13 @@ SRCS = passwd-shell.c shellutil.c
 XSRCS = pwd-version.c
 OBJS = passwd-shell.o shellutil.o
 
-VINCLUDEDIR= -I../../../include
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
 
 passwd-shell:  pwd-version.o
        $(CC) $(LDFLAGS) -o $@ $(OBJS) pwd-version.o $(LIBS)
 
-pwd-version.c: $(OBJS)
+pwd-version.c: $(OBJS) $(LDAP_LIBDEPEND)
        $(RM) $@
        (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
        t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index a8e0d302b69c44af78caa544b20dd799509c06c8..6af02348247ffc35376195f568ab0ce869de62dd 100644 (file)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -15,9 +15,8 @@
 HAVE_ISODE = @HAVE_ISODE@
 BUILD_LDBM = @BUILD_LDBM@
 
-VINCLUDEDIR= -I../../../include
-VLIBDIR= ../../../libraries
-VLIBS = -L$(VLIBDIR)
+LDAP_INCDIR= ../../../include       
+LDAP_LIBDIR= ../../../libraries
 
 PROGRAMS=ldif2index ldif2ldbm ldbmcat ldif2id2entry \
        ldif2id2children centipede ldbmtest ldif

diff --git a/servers/slurpd/Makefile.in b/servers/slurpd/Makefile.in
index 483cf9067825e88d95376ca9e8aa20fe88b38326..591efe24a6588087af4bf57cf2a5649bf44adab4 100644 (file)
--- a/servers/slurpd/Makefile.in
+++ b/servers/slurpd/Makefile.in
@@ -12,9 +12,8 @@ OBJS  =       admin.o args.o ch_malloc.o config.o detach.o \
                reject.o replica.o replog.o ri.o rq.o sanity.o st.o \
                tsleep.o
 
-VINCLUDEDIR= -I../../include
-VLIBDIR= ../../libraries
-VLIBS= -L$(VLIBDIR)
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
 
 BUILD_OPT = "--enable-slurpd"
 BUILD_SRV = @BUILD_SLURPD@
@@ -27,7 +26,7 @@ XLIBS = @SLURPD_LIBS@ -llthread @LTHREAD_LIBS@
 slurpd:        version.o
        $(CC) $(LDFLAGS) -o $@ $(OBJS) version.o $(LIBS)
 
-version.c: $(OBJS) $(LDAP_LIBDIR)/liblber.a $(LDAP_LIBDIR)/libldap.a
+version.c: $(OBJS) $(LDAP_LIBDEPEND)
        $(RM) $@
        (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` h=`$(HOSTNAME)` \
        t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \