On 6/16/06, Martin Schaffstall <martin.schaffstall at googlemail.com> wrote:
> On 6/16/06, Glenn Fowler <gsf at research.att.com> wrote:
> >
> > changes and notes:
> >
> > (1) /usr/bin -> /bin handled by iffe at compile time
> >     runtime always maps to /bin
> > (2) tab-tab as requested plus tab-tab-#-tab to disambiguate from list
> > (3) emacs mode: esc-<char> == meta-<char>: esc^V => version in emacs and vi
> > (4) <literal-next> taken from stty, defaults to ^V
> > (5) /usr/ast/bin/BUILTIN vs. /opt/ast/bin/BUILTIN vs. /usr/xpg4/bin/BUILTIN
> >     # pick a root dir where $ROOT/bin in PATH => use -lcmd builtins
> >     ROOT=/usr/ast
> >     # build ksh with SH_CMDLIB_DIR=="$ROOT"
> >     mkdir -p $ROOT/bin $ROOT/lib
> >     cp libcmd.so $ROOT/lib
> >     print $'LD_LIBRARY_PATH=../lib\nBUILTIN_LIB=cmd' > $ROOT/bin/.paths
> >     # insert $ROOT/bin in PATH before /bin and /usr/bin
> >
> >   http://www.research.att.com/~gsf/download/alpha/INIT.2006-06-16.md5
> >   http://www.research.att.com/~gsf/download/alpha/INIT.2006-06-16.tgz
> >   http://www.research.att.com/~gsf/download/alpha/ast-ksh.2006-06-16.md5
> >   http://www.research.att.com/~gsf/download/alpha/ast-ksh.2006-06-16.tgz
>
> Can anyone post a diff for the changes between 2006-05-30 and this
> source drop, pls?
patch diff attached
-- 
      _        Felix Schulte
    _|_|_     mailto:felix.schulte at gmail.com
    (0 0)
ooO--(_)--Ooo
-------------- next part --------------
diff -r -N -u ksh93_2006_05_30/lib/package/ast-ksh.html 
ksh93_2006_06_16/lib/package/ast-ksh.html
--- ksh93_2006_05_30/lib/package/ast-ksh.html   2006-05-31 05:25:22.000000000 
+0200
+++ ksh93_2006_06_16/lib/package/ast-ksh.html   2006-06-16 11:07:12.000000000 
+0200
@@ -192,14 +192,30 @@
 <P><HR><CENTER><FONT color=red><FONT face=courier><H3><A name="ksh93 
changes">ksh93 changes</A></H3></FONT></FONT></CENTER>
 <PRE>
 
-06-05-19  --- Release ksh93r+  ---
+06-06-13  --- Release ksh93r+  ---
+06-06-13  Internal change to use ordering for variables instead of hashing
+         to speed up prefix matching.
+06-06-13  A window between fork/exec in which a signal could get lost
+         and cause a peogram to hang has been eliminated
+06-06-13  A bug in edit completion with quoted strings has been fixed.
+06-06-07  The restricted options can now be enabled by set as well as on
+         the command line.  Once set, it can not be disabled.
+06-06-04  Modified built-in binding so that for systems for which /bin
+          and /usr/bin are the same, a builtin bound to /bin will get
+         selected when either /bin or /usr/bin is scanned.
+06-06-04  Added literal-next character processing for emacs/gmacs mode. 
+         This change is not compatible with earlier versions of ksh93
+          and ksh88 when the stty lnext is control-v.  The sequence
+         escape-control-v will display the shell version.
+06-05-31  Modified emacs and vi mode so that entering a TAB after a partial
+         TAB conpletion, generates a listing of possible completions.
+         After the second TAB, a number followed by a TAB will perform
+         the completion with the corresponding item.
 06-05-19  Modified arithmetic so that conversions to strings default to
          the maximum number of precision digits.
 06-05-16  Bug fixes for multibyte locales. 
 06-05-10  The =~ operator was added to &#0091;&#0091;...&#0093;&#0093; and  
&#0091;&#0091; string ~= ERE &#0093;&#0093;
          is equivalent to &#0091;&#0091; string == ~(E)ERE &#0093;&#0093;.
-06-05-10  Modified emacs and vi mode so that entering a TAB after a partial
-         TAB conpletion, generates a listing of possible completions.
 06-04-25  A bug in the vi edit mode which could cause the shell to core dump
          when switching from emacs mode.
 06-04-17  A bug in which using LANG or LC_ in assignment lists with builtins
@@ -1524,6 +1540,8 @@
 <P><HR><CENTER><FONT color=red><FONT face=courier><H3><A name="libast 
changes">libast changes</A></H3></FONT></FONT></CENTER>
 <PRE>
 
+06-06-11 cdt/dtview.c: update from kpv
+06-05-31 sfio/sfhdr.h: fix _SFOPEN() typo
 06-05-09 comp/comf.sh: add native getconf -a names to the mix
 06-04-28 misc/optget.c: add solaris long option name compatibility
 06-03-09 string/strmatch.c: add REG_ADVANCE =&gt; REG_* flags
@@ -3051,7 +3069,7 @@
 <TR>
 <TD align=left></TD>
 <TD align=center></TD>
-<TD align=right>May 30, 2006</TD>
+<TD align=right>June 16, 2006</TD>
 </TR>
 </TABLE>
 <P>
diff -r -N -u ksh93_2006_05_30/lib/package/ast-ksh.README 
ksh93_2006_06_16/lib/package/ast-ksh.README
--- ksh93_2006_05_30/lib/package/ast-ksh.README 2006-05-31 05:25:16.000000000 
+0200
+++ ksh93_2006_06_16/lib/package/ast-ksh.README 2006-06-16 11:07:06.000000000 
+0200
@@ -89,14 +89,30 @@
 
 :::::::: ksh93 ::::::::
 
-06-05-19  --- Release ksh93r+  ---
+06-06-13  --- Release ksh93r+  ---
+06-06-13  Internal change to use ordering for variables instead of hashing
+         to speed up prefix matching.
+06-06-13  A window between fork/exec in which a signal could get lost
+         and cause a peogram to hang has been eliminated
+06-06-13  A bug in edit completion with quoted strings has been fixed.
+06-06-07  The restricted options can now be enabled by set as well as on
+         the command line.  Once set, it can not be disabled.
+06-06-04  Modified built-in binding so that for systems for which /bin
+          and /usr/bin are the same, a builtin bound to /bin will get
+         selected when either /bin or /usr/bin is scanned.
+06-06-04  Added literal-next character processing for emacs/gmacs mode. 
+         This change is not compatible with earlier versions of ksh93
+          and ksh88 when the stty lnext is control-v.  The sequence
+         escape-control-v will display the shell version.
+06-05-31  Modified emacs and vi mode so that entering a TAB after a partial
+         TAB conpletion, generates a listing of possible completions.
+         After the second TAB, a number followed by a TAB will perform
+         the completion with the corresponding item.
 06-05-19  Modified arithmetic so that conversions to strings default to
          the maximum number of precision digits.
 06-05-16  Bug fixes for multibyte locales. 
 06-05-10  The =~ operator was added to [[...]] and  [[ string ~= ERE ]]
          is equivalent to [[ string == ~(E)ERE ]].
-06-05-10  Modified emacs and vi mode so that entering a TAB after a partial
-         TAB conpletion, generates a listing of possible completions.
 06-04-25  A bug in the vi edit mode which could cause the shell to core dump
          when switching from emacs mode.
 06-04-17  A bug in which using LANG or LC_ in assignment lists with builtins
@@ -1418,6 +1434,8 @@
 
 :::::::: libast ::::::::
 
+06-06-11 cdt/dtview.c: update from kpv
+06-05-31 sfio/sfhdr.h: fix _SFOPEN() typo
 06-05-09 comp/comf.sh: add native getconf -a names to the mix
 06-04-28 misc/optget.c: add solaris long option name compatibility
 06-03-09 string/strmatch.c: add REG_ADVANCE => REG_* flags
diff -r -N -u ksh93_2006_05_30/lib/package/ast-ksh.ver 
ksh93_2006_06_16/lib/package/ast-ksh.ver
--- ksh93_2006_05_30/lib/package/ast-ksh.ver    2006-05-31 05:25:14.000000000 
+0200
+++ ksh93_2006_06_16/lib/package/ast-ksh.ver    2006-06-16 11:07:01.000000000 
+0200
@@ -1 +1 @@
-ast-ksh 2006-05-30 2006-05-30 1
+ast-ksh 2006-06-16 2006-06-16 1
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/bltins/typeset.c 
ksh93_2006_06_16/src/cmd/ksh93/bltins/typeset.c
--- ksh93_2006_05_30/src/cmd/ksh93/bltins/typeset.c     2006-04-19 
22:20:27.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/bltins/typeset.c     2006-06-12 
21:52:25.000000000 +0200
@@ -913,7 +913,8 @@
        namec = nv_scan(root,nullscan,(void*)0,tp->scanmask,flag);
        argv = tp->argnam  = (char**)stakalloc((namec+1)*sizeof(char*));
        namec = nv_scan(root, pushname, (void*)tp, tp->scanmask, flag);
-       strsort(argv,namec,strcoll);
+       if(mbcoll())
+               strsort(argv,namec,strcoll);
        while(namec--)
        {
                if((np=nv_search(*argv++,root,0)) && np!=onp && (!nv_isnull(np) 
|| np->nvfun || nv_isattr(np,~NV_NOFREE)))
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/COMPATIBILITY 
ksh93_2006_06_16/src/cmd/ksh93/COMPATIBILITY
--- ksh93_2006_05_30/src/cmd/ksh93/COMPATIBILITY        2005-11-30 
22:34:47.000000000 +0100
+++ ksh93_2006_06_16/src/cmd/ksh93/COMPATIBILITY        2006-06-06 
15:56:00.000000000 +0200
@@ -121,5 +121,9 @@
 27.    The getopts builtin in ksh93 requires that optstring contain
        a leading + to allow options to begin with a +.
 
+28.    In emacs/gmacs mode, control-v will not display the version when
+       the stty lnext character is set to control-v or is unset.
+       The sequence escape control-v will display the shell version.
+
 I am interested in expanding this list so please let me know if you
 uncover any others.
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/data/builtins.c 
ksh93_2006_06_16/src/cmd/ksh93/data/builtins.c
--- ksh93_2006_05_30/src/cmd/ksh93/data/builtins.c      2006-03-28 
21:52:23.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/data/builtins.c      2006-06-08 
00:19:31.000000000 +0200
@@ -253,6 +253,8 @@
        "whenever the real and effective user id is not equal or the "
        "real and effective group id is not equal.  User profiles are "
        "not processed when \b-p\b is enabled.]"
+"[r?restricted.  Enables restricted shell.  This option cannot be unset once "
+       "enabled.]"
 "[t?Obsolete.  The shell reads one command and then exits.]"
 "[u?If enabled, the shell displays an error message when it tries to expand "
        "a variable that is unset.]"
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/data/options.c 
ksh93_2006_06_16/src/cmd/ksh93/data/options.c
--- ksh93_2006_05_30/src/cmd/ksh93/data/options.c       2006-03-28 
21:54:53.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/data/options.c       2006-06-08 
00:10:01.000000000 +0200
@@ -98,7 +98,7 @@
        bashopt("progcomp",             SH_PROGCOMP)
        bashopt("promptvars",           SH_PROMPTVARS)
        "rc",                           SH_RC|SH_COMMANDLINE,
-       "restricted",                   SH_RESTRICTED|SH_COMMANDLINE,
+       "restricted",                   SH_RESTRICTED,
        bashopt("restricted_shell",     SH_RESTRICTED2|SH_COMMANDLINE)
        bashopt("shift_verbose",        SH_SHIFT_VERBOSE)
        bashopt("sourcepath",           SH_SOURCEPATH)
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/edit/completion.c 
ksh93_2006_06_16/src/cmd/ksh93/edit/completion.c
--- ksh93_2006_05_30/src/cmd/ksh93/edit/completion.c    2006-05-10 
23:09:06.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/edit/completion.c    2006-06-14 
05:02:38.000000000 +0200
@@ -146,9 +146,9 @@
                        /* go to beginning of word */
                        if(ep->e_nlist)
                                out++;
-                       if((*--out=='\'' || *out=='"') && !openq(outbuff,out))
+                       if(((c= *out--)=='\'' || c=='"') && 
!openq(outbuff,out+1))
                        {
-                               int q = *out;
+                               int q = out[1];
                                var = 0;
                                do
                                {
@@ -176,10 +176,11 @@
                                        break;
                                if(*--out!='\\' && (ismeta(c) || c=='`' || 
c=='='))
                                {
-                                       c = *++out;
+                                       out++;
+                                       c = out[1];
                                        /* special handling for leading quote */
                                        if((c=='\'' || c=='"') && 
openq(outbuff,out))
-                                               out++;
+                                               out+=2;
                                        break;
                                }
                        }
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/edit/edit.c 
ksh93_2006_06_16/src/cmd/ksh93/edit/edit.c
--- ksh93_2006_05_30/src/cmd/ksh93/edit/edit.c  2006-05-10 18:16:26.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/edit/edit.c  2006-06-06 20:33:06.000000000 
+0200
@@ -50,7 +50,7 @@
 #include       "history.h"
 #include       "edit.h"
 
-#define CURSOR_UP       "\E[A"
+static const char CURSOR_UP[] = { ESC, '[', 'A', 0 };
 
 #if SHOPT_MULTIBYTE
 #   define is_print(c) ((c&~STRIP) || isprint(c))
@@ -972,7 +972,7 @@
                /*** map '\r' to '\n' ***/
                if(c == '\r' && mode!=2)
                        c = '\n';
-               if(ep->e_tabcount && !(c=='\t'||c==ESC || c=='\\'))
+               if(ep->e_tabcount && !(c=='\t'||c==ESC || c=='\\' || c=='=' || 
c==cntl('L') || isdigit(c)))
                        ep->e_tabcount = 0;
        }
        else
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/edit/emacs.c 
ksh93_2006_06_16/src/cmd/ksh93/edit/emacs.c
--- ksh93_2006_05_30/src/cmd/ksh93/edit/emacs.c 2006-05-10 22:57:44.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/edit/emacs.c 2006-06-06 00:02:44.000000000 
+0200
@@ -18,19 +18,12 @@
 *                                                                      *
 ***********************************************************************/
 #pragma prototyped
-/* Adapted for ksh by David Korn */
+/* Original version by Michael T. Veach 
+ * Adapted for ksh by David Korn */
 /* EMACS_MODES: c tabstop=4 
 
 One line screen editor for any program
 
-
-Questions and comments should be
-directed to 
-
-       Michael T. Veach
-       IX 1C-341 X1614
-       ihuxl!veach
-
 */
 
 
@@ -132,6 +125,7 @@
 #define hloff          editb.e_hloff
 #define hismin         editb.e_hismin
 #define usrkill                editb.e_kill
+#define usrlnext       editb.e_lnext
 #define usreof         editb.e_eof
 #define usrerase       editb.e_erase
 #define crallowed      editb.e_crlf
@@ -152,6 +146,7 @@
 #define KILLCHAR       UKILL
 #define ERASECHAR      UERASE
 #define EOFCHAR                UEOF
+#define LNEXTCHAR              ULNEXT
 #define DELETE         ('a'==97?0177:7)
 
 /**********************
@@ -293,6 +288,10 @@
                {
                        c = ERASECHAR ;
                } 
+               else if (c == usrlnext)
+               {
+                       c = LNEXTCHAR ;
+               }
                else if ((c == usreof)&&(eol == 0))
                {
                        c = EOFCHAR;
@@ -308,6 +307,9 @@
                i = cur;
                switch(c)
                {
+               case LNEXTCHAR:
+                       c = ed_getchar(ep->ed,2);
+                       goto do_default_processing;
                case cntl('V'):
                        show_info(ep,fmtident(e_version));
                        continue;
@@ -342,7 +344,9 @@
                                }
                                ep->ed->e_tabcount = 0;
                        }
+               do_default_processing:
                default:
+
                        if ((eol+1) >= (scend)) /*  will not fit on line */
                        {
                                ed_ungetchar(ep->ed,c); /* save character for 
next line */
@@ -745,6 +749,9 @@
                value = 1;
        switch(ch=i)
        {
+               case cntl('V'):
+                       show_info(ep,fmtident(e_version));
+                       return(-1);
                case ' ':
                        ep->mark = cur;
                        return(-1);
@@ -930,7 +937,18 @@
                                beep();
                        }
                        else if(i=='=')
+                       {
                                draw(ep,REFRESH);
+                               if(count>0)
+                                       ep->ed->e_tabcount=0;
+                               else
+                               {
+                                       i=ed_getchar(ep->ed,0);
+                                       ed_ungetchar(ep->ed,i);
+                                       if(isdigit(i))
+                                               ed_ungetchar(ep->ed,ESC);
+                               }
+                       }
                        else
                                draw(ep,UPDATE);
                        return(-1);
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/edit/vi.c 
ksh93_2006_06_16/src/cmd/ksh93/edit/vi.c
--- ksh93_2006_05_30/src/cmd/ksh93/edit/vi.c    2006-05-10 18:21:50.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/edit/vi.c    2006-06-02 00:00:14.000000000 
+0200
@@ -1485,7 +1485,6 @@
                                else if(vp->ed->e_tabcount==1)
                                {
                                        ed_ungetchar(vp->ed,'=');
-                                       vp->ed->e_tabcount = 0;
                                        goto escape;
                                }
                                vp->ed->e_tabcount = 0;
@@ -2287,6 +2286,10 @@
                        /***** Input commands *****/
 
 #if KSHELL
+        case '\t':
+               if(vp->ed->e_tabcount!=1)
+                       return(BAD);
+               c = '=';
        case '*':               /** do file name expansion in place **/
        case '\\':              /** do file name completion in place **/
                if( cur_virt == INVALID )
@@ -2320,6 +2323,8 @@
                        --cur_virt;
                        --last_virt;
                        vp->ocur_virt = MAXCHAR;
+                       if(c=='=')
+                               vp->ed->e_tabcount = 0;
                        return(APPEND);
                }
                break;
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/features/sigfeatures 
ksh93_2006_06_16/src/cmd/ksh93/features/sigfeatures
--- ksh93_2006_05_30/src/cmd/ksh93/features/sigfeatures 2004-08-12 
22:47:21.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/features/sigfeatures 2006-06-13 
17:18:31.000000000 +0200
@@ -5,26 +5,32 @@
        #ifndef _mem_sigvec_sv_mask
        #   undef _lib_sigvec
        #endif
-       #ifdef _lib_sigsetmask
-       #   define sigrelease(s)  sigsetmask(0)
-       #   define sig_begin()    sigsetmask(0)
+       #ifdef _lib_sigprocmask
+       #    define sh_sigaction(s,action) do { sigset_t ss;\
+                               sigemptyset(&ss);\
+                               sigaddset(&ss,(s));\
+                               sigprocmask(action,&ss,0); \
+                               }while(0)
+       #    define sigrelease(s)       sh_sigaction(s,SIG_UNBLOCK)
+       #    define sigblock(s)         sh_sigaction(s,SIG_BLOCK)
+       #    define sig_begin()         sh_sigaction(0,SIG_SETMASK)
        #else
-       #   ifdef _lib_sigrelse
-       #       define sigrelease       sigrelse
-       #       define sig_begin()
+       #   ifndef _lib_sigblock
+       #       define sigblock(s)
+       #   endif
+       #   ifdef _lib_sigsetmask
+       #       define sigrelease(s)  sigsetmask(0)
+       #       define sig_begin()    sigsetmask(0)
        #   else
-       #       ifdef _lib_sigprocmask
-       #           define sigrelease(s) do { sigset_t ss;\
-                                       sigemptyset(&ss);\
-                                       sigprocmask(SIG_SETMASK,&ss,0); \
-                                       }while(0)
-       #           define sig_begin()  sigrelease(0)
+       #       ifdef _lib_sigrelse
+       #           define sigrelease   sigrelse
+       #           define sig_begin()
        #       else
        #           define sig_begin()          (0)
        #           define sigrelease(s)        (0)
        #       endif /* _lib_sigrelse */
-       #    endif /* _lib_sigprocmask */
-       #endif /* _lib_sigsetmask */
+       #    endif /* _lib_sigsetmask */
+       #endif /* _lib_sigprocmask */
 }end
 tst    output{
        #include <signal.h>
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/include/defs.h 
ksh93_2006_06_16/src/cmd/ksh93/include/defs.h
--- ksh93_2006_05_30/src/cmd/ksh93/include/defs.h       2006-04-26 
22:55:28.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/include/defs.h       2006-06-13 
21:02:16.000000000 +0200
@@ -131,6 +131,7 @@
        long            ppid;           /* parent process id of shell */ \
        int             topfd; \
        int             sigmax;         /* maximum number of signals */ \
+       int             savesig; \
        unsigned char   *sigflag;       /* pointer to signal states */ \
        char            intrap; \
        char            login_sh; \
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/include/name.h 
ksh93_2006_06_16/src/cmd/ksh93/include/name.h
--- ksh93_2006_05_30/src/cmd/ksh93/include/name.h       2005-04-19 
20:23:57.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/include/name.h       2006-06-12 
17:54:10.000000000 +0200
@@ -158,6 +158,7 @@
 extern Namval_t                *nv_parent(Namval_t*);
 extern char            *nv_getbuf(size_t);
 extern Namval_t                *nv_mount(Namval_t*, const char *name, Dt_t*);
+extern int             nv_compare(Dt_t*, Void_t*, Void_t*, Dtdisc_t*);
 
 extern const Namdisc_t RESTRICTED_disc;
 extern char            nv_local;
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/include/streval.h 
ksh93_2006_06_16/src/cmd/ksh93/include/streval.h
--- ksh93_2006_05_30/src/cmd/ksh93/include/streval.h    2005-02-08 
02:43:06.000000000 +0100
+++ ksh93_2006_06_16/src/cmd/ksh93/include/streval.h    2006-06-07 
16:02:27.000000000 +0200
@@ -63,6 +63,9 @@
 #      define LDBL_LONGLONG_MIN        (-LDBL_LONGLONG_MAX)
 #   endif
 #endif
+#ifndef LDBL_DIG
+#   define LDBL_DIG DBL_DIG
+#endif
 
 struct lval
 {
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/Mamfile 
ksh93_2006_06_16/src/cmd/ksh93/Mamfile
--- ksh93_2006_05_30/src/cmd/ksh93/Mamfile      2006-05-31 05:25:28.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/Mamfile      2006-06-16 11:07:23.000000000 
+0200
@@ -151,7 +151,7 @@
 done ${PACKAGE_ast_INCLUDE}/cmd.h dontcare
 done include/shell.h
 done sh/pmain.c
-meta pmain.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/pmain.c pmain
+meta pmain.o %.c>%.o sh/pmain.c pmain
 prev sh/pmain.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_DYNAMIC -D_BLD_shell -D_PACKAGE_ast -DSHOPT_OO -c sh/pmain.c
 done pmain.o generated
@@ -187,7 +187,7 @@
 make alarm.o
 make bltins/alarm.c
 make FEATURE/time implicit
-meta FEATURE/time features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/time time
+meta FEATURE/time features/%>FEATURE/% features/time time
 make features/time
 done features/time
 prev shell.req
@@ -216,7 +216,7 @@
 make include/builtins.h implicit
 prev include/shtable.h implicit
 make FEATURE/dynamic implicit
-meta FEATURE/dynamic features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/dynamic dynamic
+meta FEATURE/dynamic features/%>FEATURE/% features/dynamic dynamic
 make features/dynamic
 done features/dynamic
 prev shell.req
@@ -232,7 +232,7 @@
 done ${PACKAGE_ast_INCLUDE}/fs3d.h dontcare
 done FEATURE/dynamic dontcare generated
 make FEATURE/options implicit
-meta FEATURE/options features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/options options
+meta FEATURE/options features/%>FEATURE/% features/options options
 make features/options
 done features/options
 prev shell.req
@@ -256,7 +256,7 @@
 done include/argnod.h
 make include/fault.h implicit
 make FEATURE/sigfeatures implicit
-meta FEATURE/sigfeatures features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/sigfeatures sigfeatures
+meta FEATURE/sigfeatures features/%>FEATURE/% features/sigfeatures sigfeatures
 make features/sigfeatures
 done features/sigfeatures
 prev shell.req
@@ -268,7 +268,7 @@
 exec - iffe -v -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '  ref 
${mam_cc_L+-L.} ${mam_cc_L+-L${INSTALLROOT}/lib} -I${PACKAGE_ast_INCLUDE} 
-I${INSTALLROOT}/include ${mam_libdll} ${mam_libcmd} ${mam_libast} ${mam_libm} 
${mam_libast} : run features/sigfeatures
 done FEATURE/sigfeatures dontcare generated
 make FEATURE/setjmp implicit
-meta FEATURE/setjmp features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/setjmp setjmp
+meta FEATURE/setjmp features/%>FEATURE/% features/setjmp setjmp
 make features/setjmp
 done features/setjmp
 prev shell.req
@@ -295,7 +295,7 @@
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done include/defs.h
 done bltins/alarm.c
-meta alarm.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/alarm.c alarm
+meta alarm.o %.c>%.o bltins/alarm.c alarm
 prev bltins/alarm.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c bltins/alarm.c
 done alarm.o generated
@@ -327,7 +327,7 @@
 prev ${PACKAGE_ast_INCLUDE}/stak.h implicit
 prev include/defs.h implicit
 done bltins/cd_pwd.c
-meta cd_pwd.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/cd_pwd.c cd_pwd
+meta cd_pwd.o %.c>%.o bltins/cd_pwd.c cd_pwd
 prev bltins/cd_pwd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_BLD_shell -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_OO 
-DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC 
-DSHOPT_ESH -c bltins/cd_pwd.c
 done cd_pwd.o generated
@@ -342,7 +342,7 @@
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 prev include/defs.h implicit
 done bltins/cflow.c
-meta cflow.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/cflow.c cflow
+meta cflow.o %.c>%.o bltins/cflow.c cflow
 prev bltins/cflow.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_BLD_shell -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_KIA 
-DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c bltins/cflow.c
 done cflow.o generated
@@ -355,7 +355,7 @@
 prev include/shnodes.h implicit
 prev include/defs.h implicit
 done sh/deparse.c
-meta deparse.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/deparse.c deparse
+meta deparse.o %.c>%.o sh/deparse.c deparse
 prev sh/deparse.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_KIA -D_BLD_shell 
-DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c sh/deparse.c
 done deparse.o generated
@@ -367,7 +367,7 @@
 prev include/variables.h implicit
 prev include/defs.h implicit
 done bltins/getopts.c
-meta getopts.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/getopts.c getopts
+meta getopts.o %.c>%.o bltins/getopts.c getopts
 prev bltins/getopts.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_BLD_shell -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c bltins/getopts.c
 done getopts.o generated
@@ -378,7 +378,7 @@
 done include/national.h dontcare
 make include/terminal.h implicit
 make FEATURE/ttys implicit
-meta FEATURE/ttys features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/ttys ttys
+meta FEATURE/ttys features/%>FEATURE/% features/ttys ttys
 make features/ttys
 done features/ttys
 prev shell.req
@@ -393,7 +393,7 @@
 prev FEATURE/setjmp implicit
 prev ${PACKAGE_ast_INCLUDE}/sig.h implicit
 make FEATURE/locale implicit
-meta FEATURE/locale features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/locale locale
+meta FEATURE/locale features/%>FEATURE/% features/locale locale
 make features/locale
 done features/locale
 prev shell.req
@@ -419,7 +419,7 @@
 prev ${PACKAGE_ast_INCLUDE}/stak.h implicit
 prev include/defs.h implicit
 done bltins/hist.c
-meta hist.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/hist.c hist
+meta hist.o %.c>%.o bltins/hist.c hist
 prev bltins/hist.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_HISTEXPAND -DSHOPT_MULTIBYTE -DKSHELL -DSHOPT_ESH -DSHOPT_VSH 
-D_PACKAGE_ast -DSHOPT_PFSH -D_BLD_shell -DSHOPT_OO -DSHOPT_DYNAMIC -c 
bltins/hist.c
 done hist.o generated
@@ -440,7 +440,7 @@
 prev include/variables.h implicit
 prev include/defs.h implicit
 done bltins/misc.c
-meta misc.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/misc.c misc
+meta misc.o %.c>%.o bltins/misc.c misc
 prev bltins/misc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -D_BLD_shell -DSHOPT_ESH 
-DSHOPT_OO -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_KIA 
-DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -c bltins/misc.c
 done misc.o generated
@@ -471,7 +471,7 @@
 prev ${PACKAGE_ast_INCLUDE}/error.h implicit
 prev include/defs.h implicit
 done bltins/print.c
-meta print.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/print.c print
+meta print.o %.c>%.o bltins/print.c print
 prev bltins/print.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_MULTIBYTE -D_PACKAGE_ast -D_BLD_shell -DSHOPT_PFSH -DSHOPT_ESH 
-DSHOPT_OO -DKSHELL -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -c bltins/print.c
 done print.o generated
@@ -490,14 +490,14 @@
 prev ${PACKAGE_ast_INCLUDE}/error.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done bltins/read.c
-meta read.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/read.c read
+meta read.o %.c>%.o bltins/read.c read
 prev bltins/read.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_MULTIBYTE -DSHOPT_HISTEXPAND -DKSHELL -DSHOPT_ESH -DSHOPT_VSH 
-D_PACKAGE_ast -DSHOPT_PFSH -D_BLD_shell -DSHOPT_OO -DSHOPT_DYNAMIC -c 
bltins/read.c
 done read.o generated
 make sleep.o
 make bltins/sleep.c
 make FEATURE/poll implicit
-meta FEATURE/poll features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/poll poll
+meta FEATURE/poll features/%>FEATURE/% features/poll poll
 make features/poll
 done features/poll
 prev shell.req
@@ -515,7 +515,7 @@
 prev ${PACKAGE_ast_INCLUDE}/error.h implicit
 prev include/defs.h implicit
 done bltins/sleep.c
-meta sleep.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/sleep.c sleep
+meta sleep.o %.c>%.o bltins/sleep.c sleep
 prev bltins/sleep.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c bltins/sleep.c
 done sleep.o generated
@@ -525,7 +525,7 @@
 prev include/jobs.h implicit
 prev include/defs.h implicit
 done bltins/trap.c
-meta trap.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/trap.c trap
+meta trap.o %.c>%.o bltins/trap.c trap
 prev bltins/trap.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_BLD_shell -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c bltins/trap.c
 done trap.o generated
@@ -540,7 +540,7 @@
 prev ${PACKAGE_ast_INCLUDE}/tm.h implicit
 prev FEATURE/poll implicit
 make FEATURE/externs implicit
-meta FEATURE/externs features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/externs externs
+meta FEATURE/externs features/%>FEATURE/% features/externs externs
 make features/externs
 done features/externs
 prev shell.req
@@ -559,7 +559,7 @@
 prev ${PACKAGE_ast_INCLUDE}/error.h implicit
 prev include/defs.h implicit
 done bltins/test.c
-meta test.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/test.c test
+meta test.o %.c>%.o bltins/test.c test
 prev bltins/test.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL 
-DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c bltins/test.c
 done test.o generated
@@ -574,7 +574,7 @@
 prev ${PACKAGE_ast_INCLUDE}/error.h implicit
 prev include/defs.h implicit
 done bltins/typeset.c
-meta typeset.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/typeset.c typeset
+meta typeset.o %.c>%.o bltins/typeset.c typeset
 prev bltins/typeset.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_DYNAMIC -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -D_BLD_shell 
-DSHOPT_ESH -DSHOPT_OO -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_HISTEXPAND -c 
bltins/typeset.c
 done typeset.o generated
@@ -582,7 +582,7 @@
 make bltins/ulimit.c
 make include/ulimit.h implicit
 make FEATURE/rlimits implicit
-meta FEATURE/rlimits features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/rlimits rlimits
+meta FEATURE/rlimits features/%>FEATURE/% features/rlimits rlimits
 make features/rlimits
 done features/rlimits
 prev shell.req
@@ -602,7 +602,7 @@
 prev ${PACKAGE_ast_INCLUDE}/sfio.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done bltins/ulimit.c
-meta ulimit.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/ulimit.c ulimit
+meta ulimit.o %.c>%.o bltins/ulimit.c ulimit
 prev bltins/ulimit.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -DSHOPT_OO -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH 
-DSHOPT_DYNAMIC -c bltins/ulimit.c
 done ulimit.o generated
@@ -615,7 +615,7 @@
 prev ${PACKAGE_ast_INCLUDE}/sfio.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done bltins/umask.c
-meta umask.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/umask.c umask
+meta umask.o %.c>%.o bltins/umask.c umask
 prev bltins/umask.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_BLD_shell -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_DYNAMIC 
-DSHOPT_OO -c bltins/umask.c
 done umask.o generated
@@ -635,7 +635,7 @@
 prev ${PACKAGE_ast_INCLUDE}/error.h implicit
 prev include/defs.h implicit
 done bltins/whence.c
-meta whence.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/bltins/whence.c whence
+meta whence.o %.c>%.o bltins/whence.c whence
 prev bltins/whence.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_BLD_shell -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_KIA 
-DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_OO -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_ESH -c bltins/whence.c
 done whence.o generated
@@ -688,7 +688,7 @@
 prev ${PACKAGE_ast_INCLUDE}/sfio.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done sh/main.c
-meta main.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/main.c main
+meta main.o %.c>%.o sh/main.c main
 prev sh/main.c
 exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} 
-D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_BRACEPAT -D_PACKAGE_ast -DSHOPT_ESH -DSHOPT_KIA -D_BLD_shell 
-DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_SUID_EXEC -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_OO -c sh/main.c
 done main.o generated
@@ -699,7 +699,7 @@
 prev include/variables.h implicit
 prev include/defs.h implicit
 done sh/nvdisc.c
-meta nvdisc.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/nvdisc.c nvdisc
+meta nvdisc.o %.c>%.o sh/nvdisc.c nvdisc
 prev sh/nvdisc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_NAMESPACE -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -D_BLD_shell 
-D_PACKAGE_ast -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c sh/nvdisc.c
 done nvdisc.o generated
@@ -712,7 +712,7 @@
 prev include/lexstates.h implicit
 prev include/defs.h implicit
 done sh/arith.c
-meta arith.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/arith.c arith
+meta arith.o %.c>%.o sh/arith.c arith
 prev sh/arith.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_OO -D_BLD_shell 
-DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_ESH -c sh/arith.c
 done arith.o generated
@@ -726,7 +726,7 @@
 prev include/path.h implicit
 prev include/defs.h implicit
 done sh/args.c
-meta args.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/args.c args
+meta args.o %.c>%.o sh/args.c args
 prev sh/args.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_OPTIMIZE -DSHOPT_RAWONLY -DSHOPT_HISTEXPAND -DSHOPT_PFSH -D_BLD_shell 
-DKSHELL -D_PACKAGE_ast -DSHOPT_KIA -DSHOPT_MULTIBYTE -DSHOPT_SUID_EXEC 
-DSHOPT_BRACEPAT -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c sh/args.c
 done args.o generated
@@ -736,7 +736,7 @@
 prev ${PACKAGE_ast_INCLUDE}/stak.h implicit
 prev include/defs.h implicit
 done sh/array.c
-meta array.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/array.c array
+meta array.o %.c>%.o sh/array.c array
 prev sh/array.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_APPEND -DSHOPT_OO -D_BLD_shell -D_PACKAGE_ast -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_ESH -DSHOPT_MULTIBYTE -DSHOPT_PFSH -c sh/array.c
 done array.o generated
@@ -749,7 +749,7 @@
 prev include/lexstates.h implicit
 prev include/defs.h implicit
 done edit/completion.c
-meta completion.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/edit/completion.c 
completion
+meta completion.o %.c>%.o edit/completion.c completion
 prev edit/completion.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_MULTIBYTE -DSHOPT_ESH -D_PACKAGE_ast -DSHOPT_HISTEXPAND -DKSHELL 
-DSHOPT_VSH -DSHOPT_PFSH -D_BLD_shell -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT 
-DSHOPT_DYNAMIC -DSHOPT_OO -c edit/completion.c
 done completion.o generated
@@ -761,7 +761,7 @@
 prev include/jobs.h implicit
 prev include/defs.h implicit
 done sh/defs.c
-meta defs.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/defs.c defs
+meta defs.o %.c>%.o sh/defs.c defs
 prev sh/defs.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_HISTEXPAND -DSHOPT_MULTIBYTE -DKSHELL -DSHOPT_ESH -DSHOPT_VSH 
-D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_KIA -D_BLD_shell -DSHOPT_DYNAMIC -DSHOPT_OO 
-c sh/defs.c
 done defs.o generated
@@ -779,7 +779,7 @@
 prev ${PACKAGE_ast_INCLUDE}/ccode.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done edit/edit.c
-meta edit.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/edit/edit.c edit
+meta edit.o %.c>%.o edit/edit.c edit
 prev edit/edit.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_RAWONLY -DSHOPT_ESH -DSHOPT_VSH -DSHOPT_MULTIBYTE -DSHOPT_HISTEXPAND 
-DKSHELL -D_PACKAGE_ast -DSHOPT_PFSH -D_BLD_shell -DSHOPT_DYNAMIC -DSHOPT_OO -c 
edit/edit.c
 done edit.o generated
@@ -808,7 +808,7 @@
 prev include/variables.h implicit
 prev include/defs.h implicit
 done sh/expand.c
-meta expand.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/expand.c expand
+meta expand.o %.c>%.o sh/expand.c expand
 prev sh/expand.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_BRACEPAT -DSHOPT_SUID_EXEC -D_BLD_shell -D_PACKAGE_ast 
-DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC 
-DSHOPT_OO -DSHOPT_ESH -c sh/expand.c
 done expand.o generated
@@ -824,7 +824,7 @@
 prev include/fcin.h implicit
 prev include/defs.h implicit
 done sh/fault.c
-meta fault.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/fault.c fault
+meta fault.o %.c>%.o sh/fault.c fault
 prev sh/fault.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_KIA -DSHOPT_ESH -DSHOPT_VSH -D_PACKAGE_ast -DSHOPT_SUID_EXEC 
-DSHOPT_BRACEPAT -D_BLD_shell -DSHOPT_MULTIBYTE -DSHOPT_PFSH -DKSHELL 
-DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -c sh/fault.c
 done fault.o generated
@@ -835,7 +835,7 @@
 prev ${PACKAGE_ast_INCLUDE}/sfio.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done sh/fcin.c
-meta fcin.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/fcin.c fcin
+meta fcin.o %.c>%.o sh/fcin.c fcin
 prev sh/fcin.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -c sh/fcin.c
 done fcin.o generated
@@ -854,7 +854,7 @@
 prev ${PACKAGE_ast_INCLUDE}/sfio.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done edit/history.c
-meta history.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/edit/history.c history
+meta history.o %.c>%.o edit/history.c history
 prev edit/history.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_VSH -DSHOPT_ESH -DSHOPT_MULTIBYTE -D_PACKAGE_ast -D_BLD_shell -DKSHELL 
-DSHOPT_PFSH -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_OO -c edit/history.c
 done history.o generated
@@ -886,7 +886,7 @@
 prev ${PACKAGE_ast_INCLUDE}/stak.h implicit
 prev include/defs.h implicit
 done sh/init.c
-meta init.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/init.c init
+meta init.o %.c>%.o sh/init.c init
 prev sh/init.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_PFSH -DSHOPT_NAMESPACE -DSHOPT_MULTIBYTE -D_PACKAGE_ast -D_BLD_shell 
-DSHOPT_KIA -DKSHELL -DSHOPT_HISTEXPAND -DSHOPT_ESH -DSHOPT_VSH -DSHOPT_OO 
-DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_DYNAMIC -c sh/init.c
 done init.o generated
@@ -912,7 +912,7 @@
 prev include/fcin.h implicit
 prev include/defs.h implicit
 done sh/io.c
-meta io.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/io.c io
+meta io.o %.c>%.o sh/io.c io
 prev sh/io.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_RAWONLY -DSHOPT_VSH -DSHOPT_ESH -DSHOPT_HISTEXPAND -DSHOPT_MULTIBYTE 
-DKSHELL -D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_KIA -D_BLD_shell -DSHOPT_SUID_EXEC 
-DSHOPT_BRACEPAT -DSHOPT_DYNAMIC -DSHOPT_OO -c sh/io.c
 done io.o generated
@@ -929,7 +929,7 @@
 done ${PACKAGE_ast_INCLUDE}/wait.h
 prev include/defs.h implicit
 done sh/jobs.c
-meta jobs.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/jobs.c jobs
+meta jobs.o %.c>%.o sh/jobs.c jobs
 prev sh/jobs.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_VSH -DSHOPT_ESH -D_PACKAGE_ast -DSHOPT_MULTIBYTE -DSHOPT_PFSH 
-D_BLD_shell -DKSHELL -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -c sh/jobs.c
 done jobs.o generated
@@ -948,12 +948,13 @@
 prev ${PACKAGE_ast_INCLUDE}/stak.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done sh/lex.c
-meta lex.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/lex.c lex
+meta lex.o %.c>%.o sh/lex.c lex
 prev sh/lex.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_APPEND -DSHOPT_OO -DSHOPT_MULTIBYTE -DSHOPT_KIA -D_BLD_shell 
-D_PACKAGE_ast -DSHOPT_PFSH -DKSHELL -DSHOPT_DYNAMIC -DSHOPT_HISTEXPAND 
-DSHOPT_ESH -c sh/lex.c
 done lex.o generated
 make macro.o
 make sh/macro.c
+prev include/streval.h implicit
 prev include/national.h implicit
 prev include/path.h implicit
 prev include/shnodes.h implicit
@@ -964,14 +965,15 @@
 prev include/fcin.h implicit
 prev include/defs.h implicit
 done sh/macro.c
-meta macro.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/macro.c macro
+meta macro.o %.c>%.o sh/macro.c macro
 prev sh/macro.c
-exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_BRACEPAT -DKSHELL -DSHOPT_COMPOUND_ARRAY -DSHOPT_OO -DSHOPT_FILESCAN 
-DSHOPT_MULTIBYTE -DSHOPT_SUID_EXEC -D_BLD_shell -D_PACKAGE_ast -DSHOPT_PFSH 
-DSHOPT_KIA -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_ESH -c sh/macro.c
+exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_BRACEPAT -DKSHELL -DSHOPT_COMPOUND_ARRAY -DSHOPT_OO -DSHOPT_FILESCAN 
-DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_SUID_EXEC -D_BLD_shell -DSHOPT_PFSH 
-DSHOPT_KIA -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_ESH -c sh/macro.c
 done macro.o generated
 make name.o
 make sh/name.c
 prev include/builtins.h implicit
 prev include/shnodes.h implicit
+prev include/streval.h implicit
 prev FEATURE/externs implicit
 prev FEATURE/locale implicit
 prev include/timeout.h implicit
@@ -980,7 +982,7 @@
 prev include/variables.h implicit
 prev include/defs.h implicit
 done sh/name.c
-meta name.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/name.c name
+meta name.o %.c>%.o sh/name.c name
 prev sh/name.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_OPTIMIZE -DSHOPT_MULTIBYTE -DSHOPT_COMPOUND_ARRAY -D_BLD_shell 
-D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_KIA -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT 
-DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c sh/name.c
 done name.o generated
@@ -990,7 +992,7 @@
 prev include/name.h implicit
 prev include/defs.h implicit
 done sh/nvtree.c
-meta nvtree.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/nvtree.c nvtree
+meta nvtree.o %.c>%.o sh/nvtree.c nvtree
 prev sh/nvtree.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_COMPOUND_ARRAY -D_PACKAGE_ast -DSHOPT_OO -D_BLD_shell 
-DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -DSHOPT_ESH -DSHOPT_MULTIBYTE -DSHOPT_PFSH 
-c sh/nvtree.c
 done nvtree.o generated
@@ -1006,7 +1008,7 @@
 prev include/shell.h implicit
 prev include/defs.h implicit
 done sh/parse.c
-meta parse.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/parse.c parse
+meta parse.o %.c>%.o sh/parse.c parse
 prev sh/parse.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_NAMESPACE -DSHOPT_APPEND -DSHOPT_COMPOUND_ARRAY -DSHOPT_SUID_EXEC 
-DSHOPT_BRACEPAT -D_BLD_shell -D_PACKAGE_ast -DSHOPT_MULTIBYTE -DSHOPT_PFSH 
-DSHOPT_KIA -DSHOPT_ESH -DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_HISTEXPAND -DKSHELL 
-c sh/parse.c
 done parse.o generated
@@ -1028,7 +1030,7 @@
 prev include/fcin.h implicit
 prev include/defs.h implicit
 done sh/path.c
-meta path.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/path.c path
+meta path.o %.c>%.o sh/path.c path
 prev sh/path.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_PFSH -DSHOPT_MULTIBYTE -DSHOPT_ESH 
-D_BLD_shell -DKSHELL -DSHOPT_BRACEPAT -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC 
-DSHOPT_OO -c sh/path.c
 done path.o generated
@@ -1043,7 +1045,7 @@
 prev ${PACKAGE_ast_INCLUDE}/ast_wchar.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done sh/string.c
-meta string.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/string.c string
+meta string.o %.c>%.o sh/string.c string
 prev sh/string.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC 
-D_BLD_shell -DSHOPT_OO -DSHOPT_ESH -DSHOPT_PFSH -c sh/string.c
 done string.o generated
@@ -1054,7 +1056,7 @@
 prev ${PACKAGE_ast_INCLUDE}/error.h implicit
 prev include/streval.h implicit
 done sh/streval.c
-meta streval.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/streval.c streval
+meta streval.o %.c>%.o sh/streval.c streval
 prev sh/streval.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_BLD_shell -D_PACKAGE_ast -c sh/streval.c
 done streval.o generated
@@ -1070,7 +1072,7 @@
 prev ${PACKAGE_ast_INCLUDE}/ls.h implicit
 prev include/defs.h implicit
 done sh/subshell.c
-meta subshell.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/subshell.c subshell
+meta subshell.o %.c>%.o sh/subshell.c subshell
 prev sh/subshell.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -D_BLD_shell -D_PACKAGE_ast 
-DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DKSHELL -DSHOPT_HISTEXPAND 
-DSHOPT_DYNAMIC -DSHOPT_OO -DSHOPT_ESH -c sh/subshell.c
 done subshell.o generated
@@ -1082,7 +1084,7 @@
 prev include/defs.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ccode.h implicit
 done sh/tdump.c
-meta tdump.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/tdump.c tdump
+meta tdump.o %.c>%.o sh/tdump.c tdump
 prev sh/tdump.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT 
-DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC 
-DSHOPT_OO -DSHOPT_ESH -c sh/tdump.c
 done tdump.o generated
@@ -1096,7 +1098,7 @@
 prev ${PACKAGE_ast_INCLUDE}/sig.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done sh/timers.c
-meta timers.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/timers.c timers
+meta timers.o %.c>%.o sh/timers.c timers
 prev sh/timers.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -D_BLD_shell -DSHOPT_OO 
-DSHOPT_ESH -DSHOPT_MULTIBYTE -DSHOPT_PFSH -c sh/timers.c
 done timers.o generated
@@ -1108,7 +1110,7 @@
 prev include/defs.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ccode.h implicit
 done sh/trestore.c
-meta trestore.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/trestore.c trestore
+meta trestore.o %.c>%.o sh/trestore.c trestore
 prev sh/trestore.c
 exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} 
-D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_BLD_shell -DKSHELL -D_PACKAGE_ast -DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT 
-DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC 
-DSHOPT_OO -DSHOPT_ESH -c sh/trestore.c
 done trestore.o generated
@@ -1116,7 +1118,7 @@
 make sh/waitevent.c
 prev include/defs.h implicit
 done sh/waitevent.c
-meta waitevent.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/waitevent.c waitevent
+meta waitevent.o %.c>%.o sh/waitevent.c waitevent
 prev sh/waitevent.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC -D_BLD_shell -D_PACKAGE_ast -DSHOPT_OO 
-DSHOPT_ESH -DSHOPT_MULTIBYTE -DSHOPT_PFSH -c sh/waitevent.c
 done waitevent.o generated
@@ -1142,7 +1144,7 @@
 prev include/fcin.h implicit
 prev include/defs.h implicit
 done sh/xec.c
-meta xec.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/xec.c xec
+meta xec.o %.c>%.o sh/xec.c xec
 prev sh/xec.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -DSHOPT_FILESCAN -DSHOPT_NAMESPACE -DSHOPT_OPTIMIZE -D_BLD_shell 
-DSHOPT_MULTIBYTE -DSHOPT_PFSH -DSHOPT_KIA -DKSHELL -DSHOPT_OO 
-DSHOPT_SUID_EXEC -DSHOPT_BRACEPAT -DSHOPT_HISTEXPAND -DSHOPT_DYNAMIC 
-DSHOPT_ESH -c sh/xec.c
 done xec.o generated
@@ -1152,7 +1154,7 @@
 prev ${PACKAGE_ast_INCLUDE}/cdt.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done sh/env.c
-meta env.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/env.c env
+meta env.o %.c>%.o sh/env.c env
 prev sh/env.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -c sh/env.c
 done env.o generated
@@ -1161,7 +1163,7 @@
 prev include/ulimit.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done data/limits.c
-meta limits.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/limits.c limits
+meta limits.o %.c>%.o data/limits.c limits
 prev data/limits.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast  -c data/limits.c
 done limits.o generated
@@ -1178,7 +1180,7 @@
 prev include/defs.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done data/msg.c
-meta msg.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/msg.c msg
+meta msg.o %.c>%.o data/msg.c msg
 prev data/msg.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_SUID_EXEC -DSHOPT_HISTEXPAND -DSHOPT_MULTIBYTE -DKSHELL -DSHOPT_ESH 
-DSHOPT_VSH -D_PACKAGE_ast -DSHOPT_PFSH -D_BLD_shell -DSHOPT_KIA 
-DSHOPT_BRACEPAT -DSHOPT_DYNAMIC -DSHOPT_OO  -c data/msg.c
 done msg.o generated
@@ -1186,7 +1188,7 @@
 make data/strdata.c
 prev include/streval.h implicit
 make FEATURE/math implicit
-meta FEATURE/math features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/math math
+meta FEATURE/math features/%>FEATURE/% features/math math
 make features/math
 done features/math
 prev shell.req
@@ -1199,7 +1201,7 @@
 done FEATURE/math generated
 prev FEATURE/options implicit
 done data/strdata.c
-meta strdata.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/strdata.c strdata
+meta strdata.o %.c>%.o data/strdata.c strdata
 prev data/strdata.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -DSHOPT_MULTIBYTE -DSHOPT_PFSH  -c data/strdata.c
 done strdata.o generated
@@ -1209,7 +1211,7 @@
 prev include/shtable.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done data/testops.c
-meta testops.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/testops.c testops
+meta testops.o %.c>%.o data/testops.c testops
 prev data/testops.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DUSAGE_LICENSE=\""[-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1982-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libshell]"\";
 -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH  -c data/testops.c
 done testops.o generated
@@ -1220,7 +1222,7 @@
 prev include/shell.h implicit
 prev include/shtable.h implicit
 done data/keywords.c
-meta keywords.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/keywords.c keywords
+meta keywords.o %.c>%.o data/keywords.c keywords
 prev data/keywords.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_NAMESPACE -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_KIA 
-D_BLD_shell -DSHOPT_DYNAMIC -DSHOPT_OO  -c data/keywords.c
 done keywords.o generated
@@ -1231,7 +1233,7 @@
 prev FEATURE/options implicit
 prev include/defs.h implicit
 done data/options.c
-meta options.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/options.c options
+meta options.o %.c>%.o data/options.c options
 prev data/options.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_PFSH -DSHOPT_HISTEXPAND -DSHOPT_OO -D_BLD_shell -D_PACKAGE_ast 
-DSHOPT_MULTIBYTE -DSHOPT_DYNAMIC -DSHOPT_ESH  -c data/options.c
 done options.o generated
@@ -1241,7 +1243,7 @@
 prev include/shtable.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done data/signals.c
-meta signals.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/signals.c signals
+meta signals.o %.c>%.o data/signals.c signals
 prev data/signals.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast  -c data/signals.c
 done signals.o generated
@@ -1253,7 +1255,7 @@
 prev FEATURE/options implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done data/aliases.c
-meta aliases.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/aliases.c aliases
+meta aliases.o %.c>%.o data/aliases.c aliases
 prev data/aliases.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_OO -D_BLD_shell -D_PACKAGE_ast -DSHOPT_MULTIBYTE -DSHOPT_PFSH  -c 
data/aliases.c
 done aliases.o generated
@@ -1263,7 +1265,7 @@
 prev ${PACKAGE_ast_INCLUDE}/prototyped.h implicit
 done ${PACKAGE_ast_INCLUDE}/cmdlist.h dontcare
 make FEATURE/cmds implicit
-meta FEATURE/cmds features/%>FEATURE/% 
${PACKAGEROOT}/src/cmd/ksh93/features/cmds cmds
+meta FEATURE/cmds features/%>FEATURE/% features/cmds cmds
 make features/cmds
 done features/cmds
 prev shell.req
@@ -1282,7 +1284,7 @@
 prev include/shtable.h implicit
 prev include/shell.h implicit
 done data/builtins.c
-meta builtins.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/builtins.c builtins
+meta builtins.o %.c>%.o data/builtins.c builtins
 prev data/builtins.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_KIA -DSHOPT_PFSH -DUSAGE_LICENSE=\""[-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1982-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libshell]"\";
 -DSHOPT_BRACEPAT -DSHOPT_HISTEXPAND -DSH_CMDLIB_DIR=\""/opt/ast/bin"\" 
-DSHOPT_CMDLIB_BLTIN=0 -DSHOPT_MULTIBYTE -D_PACKAGE_ast -D_BLD_shell -DKSHELL 
-DSHOPT_OO -DSHOPT_DYNAMIC  -c data/builtins.c
 done builtins.o generated
@@ -1295,7 +1297,7 @@
 prev FEATURE/options implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done data/variables.c
-meta variables.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/variables.c 
variables
+meta variables.o %.c>%.o data/variables.c variables
 prev data/variables.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_MULTIBYTE -DSHOPT_OO -D_BLD_shell -D_PACKAGE_ast -DSHOPT_DYNAMIC 
-DSHOPT_PFSH  -c data/variables.c
 done variables.o generated
@@ -1305,7 +1307,7 @@
 prev FEATURE/options implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done data/lexstates.c
-meta lexstates.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/data/lexstates.c 
lexstates
+meta lexstates.o %.c>%.o data/lexstates.c lexstates
 prev data/lexstates.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_BRACEPAT -DSHOPT_OO -DSHOPT_NAMESPACE -DSHOPT_MULTIBYTE -D_PACKAGE_ast 
-DSHOPT_PFSH  -c data/lexstates.c
 done lexstates.o generated
@@ -1318,7 +1320,7 @@
 prev include/defs.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done edit/emacs.c
-meta emacs.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/edit/emacs.c emacs
+meta emacs.o %.c>%.o edit/emacs.c emacs
 prev edit/emacs.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_MULTIBYTE -DSHOPT_HISTEXPAND -DKSHELL -DSHOPT_ESH -DSHOPT_VSH 
-D_PACKAGE_ast -DSHOPT_PFSH -D_BLD_shell -DSHOPT_DYNAMIC -DSHOPT_OO -c 
edit/emacs.c
 done emacs.o generated
@@ -1334,7 +1336,7 @@
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 prev include/defs.h implicit
 done edit/vi.c
-meta vi.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/edit/vi.c vi
+meta vi.o %.c>%.o edit/vi.c vi
 prev edit/vi.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_RAWONLY -DSHOPT_MULTIBYTE -D_PACKAGE_ast -DSHOPT_HISTEXPAND -DKSHELL 
-DSHOPT_ESH -DSHOPT_VSH -DSHOPT_PFSH -D_BLD_shell -DSHOPT_DYNAMIC -DSHOPT_OO -c 
edit/vi.c
 done vi.o generated
@@ -1343,7 +1345,7 @@
 prev include/edit.h implicit
 prev include/defs.h implicit
 done edit/hexpand.c
-meta hexpand.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/edit/hexpand.c hexpand
+meta hexpand.o %.c>%.o edit/hexpand.c hexpand
 prev edit/hexpand.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -I${PACKAGE_ast_INCLUDE} 
-DSHOPT_HISTEXPAND -DSHOPT_MULTIBYTE -DKSHELL -DSHOPT_ESH -DSHOPT_VSH 
-D_PACKAGE_ast -DSHOPT_PFSH -DSHOPT_DYNAMIC -D_BLD_shell -DSHOPT_OO -c 
edit/hexpand.c
 done hexpand.o generated
@@ -1365,7 +1367,7 @@
 prev include/shnodes.h implicit
 prev include/shell.h implicit
 done sh/shcomp.c
-meta shcomp.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/shcomp.c shcomp
+meta shcomp.o %.c>%.o sh/shcomp.c shcomp
 prev sh/shcomp.c
 setv CC.DLL -UCC.DLL
 setv SH_DICT -DSH_DICT="\"libshell\""
@@ -1392,7 +1394,7 @@
 prev FEATURE/externs implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done sh/suid_exec.c
-meta suid_exec.o %.c>%.o ${PACKAGEROOT}/src/cmd/ksh93/sh/suid_exec.c suid_exec
+meta suid_exec.o %.c>%.o sh/suid_exec.c suid_exec
 prev sh/suid_exec.c
 setv CC.DLL -UCC.DLL
 setv _BLD_shell -U_BLD_shell
@@ -1538,6 +1540,6 @@
 done tests/shtests
 exec - silent cmp 2>/dev/null -s ${INSTALLROOT}/bin/ksh ksh 2>/dev/null ||
 exec - echo "make install to run the tests on the latest ksh" >&2
-exec - cd
+exec - cd ${PACKAGEROOT}/src/cmd/ksh93/tests
 exec - SHELL=${INSTALLROOT}/bin/ksh ${INSTALLROOT}/bin/ksh shtests
 done test dontcare virtual
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/RELEASE 
ksh93_2006_06_16/src/cmd/ksh93/RELEASE
--- ksh93_2006_05_30/src/cmd/ksh93/RELEASE      2006-05-22 22:05:25.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/RELEASE      2006-06-14 05:06:24.000000000 
+0200
@@ -1,11 +1,27 @@
-06-05-19  --- Release ksh93r+  ---
+06-06-13  --- Release ksh93r+  ---
+06-06-13  Internal change to use ordering for variables instead of hashing
+         to speed up prefix matching.
+06-06-13  A window between fork/exec in which a signal could get lost
+         and cause a peogram to hang has been eliminated
+06-06-13  A bug in edit completion with quoted strings has been fixed.
+06-06-07  The restricted options can now be enabled by set as well as on
+         the command line.  Once set, it can not be disabled.
+06-06-04  Modified built-in binding so that for systems for which /bin
+          and /usr/bin are the same, a builtin bound to /bin will get
+         selected when either /bin or /usr/bin is scanned.
+06-06-04  Added literal-next character processing for emacs/gmacs mode. 
+         This change is not compatible with earlier versions of ksh93
+          and ksh88 when the stty lnext is control-v.  The sequence
+         escape-control-v will display the shell version.
+06-05-31  Modified emacs and vi mode so that entering a TAB after a partial
+         TAB conpletion, generates a listing of possible completions.
+         After the second TAB, a number followed by a TAB will perform
+         the completion with the corresponding item.
 06-05-19  Modified arithmetic so that conversions to strings default to
          the maximum number of precision digits.
 06-05-16  Bug fixes for multibyte locales. 
 06-05-10  The =~ operator was added to [[...]] and  [[ string ~= ERE ]]
          is equivalent to [[ string == ~(E)ERE ]].
-06-05-10  Modified emacs and vi mode so that entering a TAB after a partial
-         TAB conpletion, generates a listing of possible completions.
 06-04-25  A bug in the vi edit mode which could cause the shell to core dump
          when switching from emacs mode.
 06-04-17  A bug in which using LANG or LC_ in assignment lists with builtins
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/args.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/args.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/args.c    2005-12-07 19:20:10.000000000 
+0100
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/args.c    2006-06-08 00:18:11.000000000 
+0200
@@ -189,12 +189,15 @@
                        if(o<=0
                                || (!sh_isoption(SH_BASH) && (o&SH_BASHEXTRA))
                                || ((!sh_isoption(SH_BASH) || n=='o') && 
(o&SH_BASHOPT))
+
                                || (setflag && (o&SH_COMMANDLINE)))
                        {
                                errormsg(SH_DICT,2, e_option, opt_info.arg);
                                error_info.errors++;
                        }
                        o &= 0xff;
+                       if(sh_isoption(SH_RESTRICTED) && !f && o==SH_RESTRICTED)
+                               errormsg(SH_DICT,ERROR_exit(1), e_restricted, 
opt_info.arg);
                        break;
 #if SHOPT_BASH
                    case -1:    /* --rcfile */
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/defs.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/defs.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/defs.c    2003-04-08 16:00:43.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/defs.c    2006-06-12 17:42:16.000000000 
+0200
@@ -36,7 +36,7 @@
 
 Dtdisc_t       _Nvdisc =
 {
-       offsetof(Namval_t,nvname), -1
+       offsetof(Namval_t,nvname), -1 , 0, 0, 0, nv_compare
 };
 
 /* reserve room for writable state table */
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/fault.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/fault.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/fault.c   2005-03-24 19:03:50.000000000 
+0100
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/fault.c   2006-06-13 21:07:06.000000000 
+0200
@@ -67,6 +67,12 @@
        if(!(sig&SH_TRAP))
                signal(sig, sh_fault);
        sig &= ~SH_TRAP;
+       if(sh.savesig)
+       {
+               /* critical region, save and process later */
+               sh.savesig = sig;
+               return;
+       }
 #ifdef SIGWINCH
        if(sig==SIGWINCH)
        {
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/init.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/init.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/init.c    2006-05-08 23:24:54.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/init.c    2006-06-12 17:56:14.000000000 
+0200
@@ -1237,7 +1237,7 @@
 #if SHOPT_BASH
        nv_search("local",shp->bltin_tree,0)->nvfun = (void*)&typeset;
 #endif
-       shp->fun_tree = dtopen(&_Nvdisc,Dtset);
+       shp->fun_tree = dtopen(&_Nvdisc,Dtoset);
        dtview(shp->fun_tree,shp->bltin_tree);
 #if SHOPT_NAMESPACE
        np = nv_mount(DOTSHNOD, "global", shp->var_tree);
@@ -1246,7 +1246,7 @@
        nv_putval(np,".sh.global",NV_RDONLY|NV_NOFREE);
        nv_stack(np, &NSPACE_init);
 #endif /* SHOPT_NAMESPACE */
-       np = nv_mount(DOTSHNOD, "type", dtopen(&_Nvdisc,Dtset));
+       np = nv_mount(DOTSHNOD, "type", dtopen(&_Nvdisc,Dtoset));
        nv_adddisc(DOTSHNOD, shdiscnames, (Namval_t**)0);
        return(ip);
 }
@@ -1269,7 +1269,7 @@
                shp->bltin_nodes = np;
        else if(name_vals==(const struct shtable2*)shtab_builtins)
                shp->bltin_cmds = np;
-       base_treep = treep = dtopen(&_Nvdisc,Dtset);
+       base_treep = treep = dtopen(&_Nvdisc,Dtoset);
        for(tp=name_vals;*tp->sh_name;tp++,np++)
        {
                if((np->nvname = strrchr(tp->sh_name,'.')) && 
np->nvname!=((char*)tp->sh_name))
@@ -1286,7 +1286,7 @@
                        np->nvalue.cp = (char*)tp->sh_value;
                nv_setattr(np,tp->sh_number);
                if(nv_istable(np))
-                       nv_mount(np,(const char*)0,dict=dtopen(&_Nvdisc,Dtset));
+                       nv_mount(np,(const 
char*)0,dict=dtopen(&_Nvdisc,Dtoset));
                if(nv_isattr(np,NV_INTEGER))
                        nv_setsize(np,10);
                else
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/io.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/io.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/io.c      2006-03-29 17:12:33.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/io.c      2006-06-13 21:00:50.000000000 
+0200
@@ -1267,6 +1267,11 @@
 {
        int fd = sffileno(iop);
        NOT_USED(handle);
+       if(sh.trapnote)
+       {
+               errno = EINTR;
+               return(-1);
+       }
        if(sh_isstate(SH_INTERACTIVE) && io_prompt(iop,sh.nextprompt)<0 && 
errno==EIO)
                return(0);
        if(!(sh.fdstatus[sffileno(iop)]&IOCLEX) && sfset(iop,0,0)&SF_SHARE)
@@ -1302,6 +1307,11 @@
        else
 #   endif      /* SHOPT_VSH */
                readf = ed_read;
+       if(sh.trapnote)
+       {
+               errno = EINTR;
+               return(-1);
+       }
        while(1)
        {
                if(io_prompt(iop,sh.nextprompt)<0 && errno==EIO)
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/macro.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/macro.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/macro.c   2006-05-22 19:47:24.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/macro.c   2006-06-07 05:13:16.000000000 
+0200
@@ -41,7 +41,7 @@
 #include       "shnodes.h"
 #include       "path.h"
 #include       "national.h"
-#include       <float.h>
+#include       "streval.h"
 
 
 #undef STR_GROUP
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/name.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/name.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/name.c    2006-05-22 20:24:46.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/name.c    2006-06-12 17:59:09.000000000 
+0200
@@ -31,7 +31,7 @@
 #include       "timeout.h"
 #include       "FEATURE/locale"
 #include       "FEATURE/externs"
-#include       <float.h>
+#include       "streval.h"
 
 #if !_lib_pathnative && _lib_uwin_path
 
@@ -1328,7 +1328,7 @@
 void nv_scope(struct argnod *envlist)
 {
        register Dt_t *newscope;
-       newscope = dtopen(&_Nvdisc,Dtbag);
+       newscope = dtopen(&_Nvdisc,Dtoset);
        dtview(newscope,(Dt_t*)sh.var_tree);
        sh.var_tree = (Dt_t*)newscope;
        if(envlist)
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/nvdisc.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/nvdisc.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/nvdisc.c  2006-04-26 22:49:01.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/nvdisc.c  2006-06-12 17:58:30.000000000 
+0200
@@ -30,6 +30,13 @@
 
 static const char *discnames[] = { "get", "set", "append", "unset", 0 };
 
+int     nv_compare(Dt_t* dict, Void_t *sp, Void_t *dp, Dtdisc_t *disc)
+{
+       if(sp==dp)
+               return(0);
+       return(strcmp((char*)sp,(char*)dp));
+}
+
 /*
  * call the next getval function in the chain
  */
@@ -1005,7 +1012,7 @@
 {
        struct table    *tp = (struct table*)fp;
        struct table    *ntp = (struct table*)nv_clone_disc(fp);
-       Dt_t            *oroot=tp->dict,*nroot=dtopen(&_Nvdisc,Dtset);
+       Dt_t            *oroot=tp->dict,*nroot=dtopen(&_Nvdisc,Dtoset);
        if(!nroot)
                return(0);
        memcpy((void*)ntp,(void*)fp,sizeof(struct table));
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/nvtree.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/nvtree.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/nvtree.c  2006-04-19 22:50:20.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/nvtree.c  2006-06-12 20:02:49.000000000 
+0200
@@ -104,7 +104,7 @@
        char *next,*last;
        int len=strlen(name);
        struct nvdir *save, *dp = new_of(struct nvdir,len);
-       Namval_t *np;
+       Namval_t *np, fake;
        Namfun_t *nfp;
        if(!dp)
                return(0);
@@ -117,7 +117,14 @@
        dp->len = len;
        dp->root = sh.var_tree;
        dp->table = sh.last_table;
-       dp->hp = (Namval_t*)dtfirst(dp->root);
+       if(*name)
+       {
+               fake.nvname = (char*)name;
+               dp->hp = (Namval_t*)dtprev(dp->root,&fake);
+               dp->hp = (Namval_t*)dtnext(dp->root,dp->hp);
+       }
+       else
+               dp->hp = (Namval_t*)dtfirst(dp->root);
        while(next= nextdot(last))
        {
                *next = 0;
@@ -160,6 +167,8 @@
 {
        if(dp->nextnode)
                return((*dp->nextnode)(dp->hp,dp->root,dp->fun));
+       if(dp->len && memcmp(dp->data, dp->hp->nvname, dp->len))
+               return(0);
        return((Namval_t*)dtnext(dp->root,dp->hp));
 }
 
@@ -541,7 +550,6 @@
        *argv = 0;
        for(; ap; ap=ap->argchn.ap)
                *--argv = ap->argval;
-       strsort(argv,n,strcmp);
        nv_dirclose(dir);
        if(dlete&1)
                outfile = 0;
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/path.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/path.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/path.c    2006-02-06 16:22:21.000000000 
+0100
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/path.c    2006-06-06 05:49:20.000000000 
+0200
@@ -1212,6 +1212,17 @@
        register Pathcomp_t *pp, *oldpp;
        struct stat statb;
        int len, offset=staktell();
+       static ino_t    bin_inode;
+       static dev_t    bin_dev;
+       if(bin_inode==0)
+       {
+               bin_inode = 1;
+               if(stat("/bin",&statb)>=0 && S_ISDIR(statb.st_mode))
+               {
+                       bin_inode = statb.st_ino;
+                       bin_dev = statb.st_dev;
+               }
+       }
        if(!(flag&PATH_BFPATH))
        {
                register const char *cp = name;
@@ -1259,6 +1270,11 @@
                        flag |= PATH_SKIP;
                }
        }
+       if(statb.st_ino==bin_inode && statb.st_dev==bin_dev)
+       {
+               name = "/bin";
+               len = 4;
+       }
        pp = newof((Pathcomp_t*)0,Pathcomp_t,1,len+1);
        pp->refcount = 1;
        memcpy((char*)(pp+1),name,len+1);
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/subshell.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/subshell.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/subshell.c        2005-02-25 
16:29:29.000000000 +0100
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/subshell.c        2006-06-12 
17:57:43.000000000 +0200
@@ -265,7 +265,7 @@
                return(sh.alias_tree);
        if(!sp->salias && create)
        {
-               sp->salias = dtopen(&_Nvdisc,Dtbag);
+               sp->salias = dtopen(&_Nvdisc,Dtoset);
                dtview(sp->salias,sh.alias_tree);
                sh.alias_tree = sp->salias;
        }
@@ -283,7 +283,7 @@
                return(sh.fun_tree);
        if(!sp->sfun && create)
        {
-               sp->sfun = dtopen(&_Nvdisc,Dtbag);
+               sp->sfun = dtopen(&_Nvdisc,Dtoset);
                dtview(sp->sfun,sh.fun_tree);
                sh.fun_tree = sp->sfun;
        }
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh/xec.c 
ksh93_2006_06_16/src/cmd/ksh93/sh/xec.c
--- ksh93_2006_05_30/src/cmd/ksh93/sh/xec.c     2006-04-26 22:53:27.000000000 
+0200
+++ ksh93_2006_06_16/src/cmd/ksh93/sh/xec.c     2006-06-13 21:11:35.000000000 
+0200
@@ -1657,7 +1657,7 @@
                                sh.namespace = np;
                                if(!(root=nv_dict(np)))
                                {
-                                       root = dtopen(&_Nvdisc,Dtbag);
+                                       root = dtopen(&_Nvdisc,Dtoset);
                                        
nv_putval(np,(char*)root,NV_TABLE|NV_NOFREE);
                                        sh.st.optindex = 1;
                                }
@@ -1983,6 +1983,7 @@
        static long forkcnt = 1000L;
        pid_t   curpgid = job.curpgid;
        pid_t   postid = (flags&FAMP)?0:curpgid;
+       int sig;
        if(parent<0)
        {
                if((forkcnt *= 2) > 1000L*SH_FORKLIM)
@@ -2079,12 +2080,18 @@
        /* except for those `lost' by trap   */
        sh_sigreset(2);
        sh.subshell = 0;
+       sig = sh.savesig;
+       sh.savesig = 0;
+       if(sig>0)
+               sh_fault(sig);
+       sh_sigcheck();
        return(0);
 }
 
 pid_t sh_fork(int flags, int *jobid)
 {
        register pid_t parent;
+       register int sig;
 #if SHOPT_FASTPIPE
        if(sffileno(sfstdin)<0)
        {
@@ -2099,7 +2106,12 @@
        sfsync(NIL(Sfio_t*));
        sh.trapnote &= ~SH_SIGTERM;
        job_fork(-1);
+       sh.savesig = -1;
        while(_sh_fork(parent=fork(),flags,jobid) < 0);
+       sig = sh.savesig;
+       sh.savesig = 0;
+       if(sig>0)
+               sh_fault(sig);
        job_fork(parent);
        return(parent);
 }
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/sh.1 
ksh93_2006_06_16/src/cmd/ksh93/sh.1
--- ksh93_2006_05_30/src/cmd/ksh93/sh.1 2006-05-17 04:21:31.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/sh.1 2006-06-08 00:20:25.000000000 +0200
@@ -3928,6 +3928,15 @@
 are used to find the longest command prefix.
 If only a single name matches this prefix, then the
 word is replaced with the command name followed by a space.
+When using a
+.I tab\^
+for completion that does not yield a unique match,
+a subsequent
+.I tab\^
+will provide a numbered list of matching alternatives.
+A specific selection can be made by entering the
+selection number followed by a
+.IR tab .
 .SS Key Bindings.
 The
 .B
@@ -4092,6 +4101,18 @@
 Delete previous character.
 .PP
 .TP 10
+.I lnext
+(User defined literal next character as defined
+by the
+.IR stty (1)
+command.
+or
+.B ^V
+if not defined.)
+Removes the next character's
+editing features (if any).
+.PP
+.TP 10
 .BI ^D
 Delete current character.
 .PP
@@ -4376,7 +4397,7 @@
 editing features (if any).
 .PP
 .TP 10
-.B ^V
+.B M-^V
 Display version of the shell.
 .PP
 .TP 10
@@ -4457,15 +4478,14 @@
 option is set.
 Otherwise this character is ignored.
 .TP 10
-.BI ^V
-Escape next character.
-Editing characters and the user's erase or kill
-characters may be entered
-in a command line or in a search string if preceded by a
-.BR ^V .
-The
+.I lnext
+(User defined literal next character as defined
+by the
+.IR stty (1)
+or
 .B ^V
-removes the next character's
+if not defined.)
+Removes the next character's
 editing features (if any).
 On some systems the \f3viraw\fP option
 may be required for this to work.
@@ -6000,7 +6020,7 @@
 then it behaves the same as
 .BR exit .
 .TP
-\(dg \f3set\fP \*(OK \f3\(+-CGabefhkmnopstuvx\fP \*(CK \*(OK \f3\(+-o\fP \*(OK 
\f2option\^\fP \*(CK \*(CK .\|.\|. \*(OK \f3\(+-A\fP \f2vname\^\fP \*(CK  \*(OK 
\f2arg\^\fP .\|.\|. \*(CK
+\(dg \f3set\fP \*(OK \f3\(+-CGabefhkmnoprstuvx\fP \*(CK \*(OK \f3\(+-o\fP 
\*(OK \f2option\^\fP \*(CK \*(CK .\|.\|. \*(OK \f3\(+-A\fP \f2vname\^\fP \*(CK  
\*(OK \f2arg\^\fP .\|.\|. \*(CK
 The options for this command have meaning as follows:
 .RS
 .PD 0
@@ -6214,6 +6234,10 @@
 Turning this off causes the effective uid and gid to be
 set to the real uid and gid.
 .TP 8
+.B \-r
+Enables the restricted shell.  This option cannot be unset
+once set.
+.TP 8
 .B \-s
 Sort the positional parameters lexicographically.
 .TP 8
@@ -7010,6 +7034,8 @@
 .RS
 .PD 0
 .PP
+Unsetting the restricted option.
+.br
 changing directory (see
 .IR cd (1)),
 .br
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/tests/arith.sh 
ksh93_2006_06_16/src/cmd/ksh93/tests/arith.sh
--- ksh93_2006_05_30/src/cmd/ksh93/tests/arith.sh       2006-05-22 
22:00:04.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/tests/arith.sh       2006-06-15 
15:16:20.000000000 +0200
@@ -315,6 +315,7 @@
 then   err_exit 'parsing error with x$((10))=foo'
 fi
 $SHELL -c 'typeset x$((10))=foo' 2> /dev/null || err_exit 'typeset x$((10)) 
parse error'
+unset x
 x=$(( exp(log(2.0)) ))
 (( x > 1.999 && x < 2.001 )) || err_exit 'composit functions not working'
 unset x y n
diff -r -N -u ksh93_2006_05_30/src/cmd/ksh93/tests/coprocess.sh 
ksh93_2006_06_16/src/cmd/ksh93/tests/coprocess.sh
--- ksh93_2006_05_30/src/cmd/ksh93/tests/coprocess.sh   2006-03-27 
18:27:30.000000000 +0200
+++ ksh93_2006_06_16/src/cmd/ksh93/tests/coprocess.sh   2006-06-09 
21:21:17.000000000 +0200
@@ -167,29 +167,47 @@
                break
        fi
 done
+
+trap 'sleep_pid=; kill $pid; err_exit "coprocess 1 hung"' TERM
+{ sleep 5; kill $$; } &
+sleep_pid=$!
 builtin cat
 cat |&
 pid=$!
 exec 5<&p 6>&p
 print -u6 hi; read -u5
 [[ $REPLY == hi ]] || err_exit 'REPLY is $REPLY not hi'
-integer s=SECONDS
-sleep 5 &
 exec 6>&-
 wait $pid
-(( (SECONDS-s) > 3 )) && err_exit  'time out because builtin keeps fd open'
+trap - TERM
+[[ $sleep_pid ]] && kill $sleep_pid
+
+trap 'sleep_pid=; kill $pid; err_exit "coprocess 2 hung"' TERM
+{ sleep 5; kill $$; } &
+sleep_pid=$!
 cat |& 
 pid=$!
 print foo >&p 2> /dev/null || err_exit 'first write of foo to coprocess failed'
 print foo >&p 2> /dev/null || err_exit 'second write of foo to coprocess 
failed'
 kill $pid
 wait $pid 2> /dev/null
+trap - TERM
+[[ $sleep_pid ]] && kill $sleep_pid
+
+trap 'sleep_pid=; kill $pid; err_exit "coprocess 3 hung"' TERM
+{ sleep 5; kill $$; } &
+sleep_pid=$!
 cat |& 
 pid=$!
 print -p foo
 print -p bar
 read <&p || err_exit 'first read from coprocess failed'
+[[ $REPLY == foo ]] || err_exit "first REPLY is $REPLY not foo"
 read <&p || err_exit 'second read from coprocess failed'
+[[ $REPLY == bar ]] || err_exit "second REPLY is $REPLY not bar"
 kill $pid
 wait $pid 2> /dev/null
+trap - TERM
+[[ $sleep_pid ]] && kill $sleep_pid
+
 exit $((Errors))
diff -r -N -u ksh93_2006_05_30/src/lib/libast/cdt/dtview.c 
ksh93_2006_06_16/src/lib/libast/cdt/dtview.c
--- ksh93_2006_05_30/src/lib/libast/cdt/dtview.c        2001-09-19 
17:57:22.000000000 +0200
+++ ksh93_2006_06_16/src/lib/libast/cdt/dtview.c        2006-06-12 
21:39:00.000000000 +0200
@@ -36,80 +36,81 @@
 reg int                type;
 #endif
 {
-       reg Dt_t        *d, *p;
-       reg Void_t*     o;
-       reg Dtdisc_t*   disc;
-       reg Dtlink_t*   here;
+       Dt_t            *d, *p;
+       Void_t          *o, *n, *ok, *nk;
+       int             cmp, lk, sz, ky;
+       Dtcompar_f      cmpf;
 
        /* these operations only happen at the top level */
        if(type&(DT_INSERT|DT_DELETE|DT_CLEAR|DT_RENEW))
                return (*(dt->meth->searchf))(dt,obj,type);
 
-       if(!obj && !(type&(DT_FIRST|DT_LAST)) )
-               return NIL(Void_t*);
-
-       if(type&(DT_MATCH|DT_SEARCH|DT_FIRST|DT_LAST))
+       if((type&(DT_MATCH|DT_SEARCH)) || /* order sets first/last done below */
+          ((type&(DT_FIRST|DT_LAST)) && !(dt->meth->type&(DT_OBAG|DT_OSET)) ) )
        {       for(d = dt; d; d = d->view)
-               {       if((o = (*(d->meth->searchf))(d,obj,type)) )
-                       {       dt->walk = d;
-                               return o;
-                       }
-               }
-
-               dt->walk = NIL(Dt_t*);
-               return NIL(Void_t*);
+                       if((o = (*(d->meth->searchf))(d,obj,type)) )
+                               break;
+               dt->walk = d;
+               return o;
        }
 
-       /* must be (DT_NEXT|DT_PREV) */
-       if(!dt->walk || !(here = dt->walk->data->here) ||
-          obj != _DTOBJ(here,dt->walk->disc->link) )
-       {       for(d = dt; d; d = d->view)
-               {       if((o = (*(d->meth->searchf))(d,obj,DT_SEARCH)) )
-                       {       dt->walk = d;
-                               goto do_adj;
+       if(dt->meth->type & (DT_OBAG|DT_OSET) )
+       {       if(!(type & (DT_FIRST|DT_LAST|DT_NEXT|DT_PREV)) )
+                       return NIL(Void_t*);
+
+               n = nk = NIL(Void_t*); p = NIL(Dt_t*);
+               for(d = dt; d; d = d->view)
+               {       if(!(o = (*d->meth->searchf)(d, obj, type)) )
+                               continue;
+                       _DTDSC(d->disc,ky,sz,lk,cmpf);
+                       ok = _DTKEY(o,ky,sz);
+
+                       if(n) /* get the right one among all dictionaries */
+                       {       cmp = _DTCMP(d,ok,nk,d->disc,cmpf,sz);
+                               if(((type & (DT_NEXT|DT_FIRST)) && cmp < 0) ||
+                                  ((type & (DT_PREV|DT_LAST)) && cmp > 0) )
+                                       goto a_dj;
+                       }
+                       else /* looks good for now */
+                       { a_dj: p  = d;
+                               n  = o;
+                               nk = ok;
                        }
                }
 
-               dt->walk = NIL(Dt_t*);
+               dt->walk = p;
+               return n;
+       }
+
+       /* non-ordered methods */
+       if(!(type & (DT_NEXT|DT_PREV)) )
                return NIL(Void_t*);
+
+       if(!dt->walk || obj != _DTOBJ(dt->walk->data->here, 
dt->walk->disc->link) )
+       {       for(d = dt; d; d = d->view)
+                       if((o = (*(d->meth->searchf))(d, obj, DT_SEARCH)) )
+                               break;
+               dt->walk = d;
+               if(!(obj = o) )
+                       return NIL(Void_t*);
        }
 
-do_adj: for(d = dt->walk, o = (*(d->meth->searchf))(d,obj,type); ; )
-       {       while(o)
-               {       disc = d->disc;
-                       here = (d->meth->type&(DT_SET|DT_BAG)) ?
-                                       d->data->here : NIL(Dtlink_t*);
-
-                       for(p = dt; ; p = p->view)
-                       {       reg Dtdisc_t*   dc;
-
-                               if(p == d) /* this object is uncovered */       
-                                       return o;
-
-                               /* see if it is covered */
-                               if(here && (p->meth->type&(DT_SET|DT_BAG)) &&
-                                  (disc == (dc = p->disc) ||
-                                   (disc->key == dc->key && disc->size == 
dc->size &&
-                                    disc->link == dc->link && disc->hashf == 
dc->hashf)))
-                               {       
if((*(p->meth->searchf))(p,here,DT_VSEARCH) )
-                                               break;
-                               }
-                               else
-                               {       if((*(p->meth->searchf))(p,o,DT_SEARCH) 
)
-                                               break;
-                               }
+       for(d = dt->walk, obj = (*d->meth->searchf)(d, obj, type);; )
+       {       while(obj) /* keep moving until finding an uncovered object */
+               {       for(p = dt; ; p = p->view)
+                       {       if(p == d) /* adjacent object is uncovered */   
+                                       return obj;
+                               if((*(p->meth->searchf))(p, obj, DT_SEARCH) )
+                                       break;
                        }
-
-                       o = (*(d->meth->searchf))(d,o,type);
+                       obj = (*d->meth->searchf)(d, obj, type);
                }
 
-               if(!(d = dt->walk = d->view) )
+               if(!(d = dt->walk = d->view) ) /* move on to next dictionary */
                        return NIL(Void_t*);
-
-               if(type&DT_NEXT)
-                       o = (*(d->meth->searchf))(d,NIL(Void_t*),DT_FIRST);
-               else /* if(type&DT_PREV) */
-                       o = (*(d->meth->searchf))(d,NIL(Void_t*),DT_LAST);
+               else if(type&DT_NEXT)
+                       obj = (*(d->meth->searchf))(d,NIL(Void_t*),DT_FIRST);
+               else    obj = (*(d->meth->searchf))(d,NIL(Void_t*),DT_LAST);
        }
 }
 
@@ -125,7 +126,10 @@
 
        UNFLATTEN(dt);
        if(view)
-               UNFLATTEN(view);
+       {       UNFLATTEN(view);
+               if(view->meth != dt->meth) /* must use the same method */
+                       return NIL(Dt_t*);
+       }
 
        /* make sure there won't be a cycle */
        for(d = view; d; d = d->view)
diff -r -N -u ksh93_2006_05_30/src/lib/libast/Mamfile 
ksh93_2006_06_16/src/lib/libast/Mamfile
--- ksh93_2006_05_30/src/lib/libast/Mamfile     2006-05-31 05:25:54.000000000 
+0200
+++ ksh93_2006_06_16/src/lib/libast/Mamfile     2006-06-16 11:07:58.000000000 
+0200
@@ -36,20 +36,19 @@
 done ${PACKAGEROOT}/lib/package/ast.lic
 make include/ast_version.h
 done include/ast_version.h ignore
-prev include/ast_version.h
 make install
 make ast
 make libast.a archive
 make ast.req
 make FEATURE/standards
-meta FEATURE/standards features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/standards standards
+meta FEATURE/standards features/%>FEATURE/% features/standards standards
 make features/standards
 done features/standards
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/standards
 done FEATURE/standards generated
 make ast_common.h
 make FEATURE/common
-meta FEATURE/common features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/common common
+meta FEATURE/common features/%>FEATURE/% features/common common
 make features/common
 done features/common
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/common
@@ -58,13 +57,13 @@
 done ast_common.h generated
 make ast_limits.h
 make FEATURE/limits
-meta FEATURE/limits features/%.c>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/limits.c limits
+meta FEATURE/limits features/%.c>FEATURE/% features/limits.c limits
 make features/limits.c
 make conflim.h implicit
 make conf
 make comp/conf.sh
 done comp/conf.sh
-meta conf %.sh>% ${PACKAGEROOT}/src/lib/libast/comp/conf.sh conf
+meta conf %.sh>% comp/conf.sh conf
 prev comp/conf.sh
 exec - case static,port:$OPTIND:$RANDOM in
 exec - ?*:*:*|*::*|*:*:$RANDOM)
@@ -105,7 +104,7 @@
 make joint.conflib.h implicit joint
 make conflib.h implicit
 make FEATURE/wait implicit
-meta FEATURE/wait features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/wait wait
+meta FEATURE/wait features/%>FEATURE/% features/wait wait
 make features/wait
 done features/wait
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/wait
@@ -130,7 +129,7 @@
 done sysconf.c generated
 done joint.conflib.h virtual
 make FEATURE/param implicit
-meta FEATURE/param features/%.sh>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/param.sh param
+meta FEATURE/param features/%.sh>FEATURE/% features/param.sh param
 make features/param.sh
 done features/param.sh
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/param.sh
@@ -149,7 +148,7 @@
 done FEATURE/unistd.lcl generated
 prev FEATURE/common implicit
 make FEATURE/lib implicit
-meta FEATURE/lib features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/lib lib
+meta FEATURE/lib features/%>FEATURE/% features/lib lib
 make features/lib
 done features/lib
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/lib
@@ -161,7 +160,7 @@
 make std/stdio.h implicit
 make ast_stdio.h implicit
 make FEATURE/stdio
-meta FEATURE/stdio features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/stdio stdio
+meta FEATURE/stdio features/%>FEATURE/% features/stdio stdio
 make features/stdio
 done features/stdio
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/stdio
@@ -183,7 +182,7 @@
 prev ast_stdio.h
 make ast_nl_types.h
 make FEATURE/nl_types
-meta FEATURE/nl_types features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/nl_types nl_types
+meta FEATURE/nl_types features/%>FEATURE/% features/nl_types nl_types
 make features/nl_types
 done features/nl_types
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/nl_types
@@ -196,7 +195,7 @@
 done ast_nl_types.h generated
 make ast_wchar.h
 make FEATURE/wchar
-meta FEATURE/wchar features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/wchar wchar
+meta FEATURE/wchar features/%>FEATURE/% features/wchar wchar
 make features/wchar
 done features/wchar
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/wchar
@@ -268,10 +267,10 @@
 make include/ast_std.h implicit
 make ast_botch.h implicit
 make FEATURE/botch
-meta FEATURE/botch features/%.c>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/botch.c botch
+meta FEATURE/botch features/%.c>FEATURE/% features/botch.c botch
 make features/botch.c
 make FEATURE/types implicit
-meta FEATURE/types features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/types types
+meta FEATURE/types features/%>FEATURE/% features/types types
 make features/types
 done features/types
 prev ast.req
@@ -286,7 +285,7 @@
 done ast_botch.h dontcare generated
 make ast_unistd.h implicit
 make FEATURE/unistd
-meta FEATURE/unistd features/%.c>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/unistd.c unistd
+meta FEATURE/unistd features/%.c>FEATURE/% features/unistd.c unistd
 make features/unistd.c
 make confuni.h implicit
 done confuni.h
@@ -304,17 +303,17 @@
 done ast_unistd.h dontcare generated
 make ast_fcntl.h implicit
 make FEATURE/fcntl
-meta FEATURE/fcntl features/%.c>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/fcntl.c fcntl
+meta FEATURE/fcntl features/%.c>FEATURE/% features/fcntl.c fcntl
 make features/fcntl.c
 make FEATURE/tty implicit
-meta FEATURE/tty features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/tty tty
+meta FEATURE/tty features/%>FEATURE/% features/tty tty
 make features/tty
 done features/tty
 prev ast.req
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/tty
 done FEATURE/tty generated
 make FEATURE/fs implicit
-meta FEATURE/fs features/%>FEATURE/% ${PACKAGEROOT}/src/lib/libast/features/fs 
fs
+meta FEATURE/fs features/%>FEATURE/% features/fs fs
 make features/fs
 done features/fs
 prev ast.req
@@ -334,7 +333,7 @@
 make include/ls.h implicit
 make ast_mode.h implicit
 make FEATURE/mode
-meta FEATURE/mode features/%.c>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/mode.c mode
+meta FEATURE/mode features/%.c>FEATURE/% features/mode.c mode
 make features/mode.c
 make include/modecanon.h implicit
 done include/modecanon.h
@@ -365,16 +364,16 @@
 done ast_types.h dontcare generated
 make ast_map.h implicit
 make FEATURE/map
-meta FEATURE/map features/%.c>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/map.c map
+meta FEATURE/map features/%.c>FEATURE/% features/map.c map
 make features/map.c
 make FEATURE/vmalloc implicit
-meta FEATURE/vmalloc features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/vmalloc vmalloc
+meta FEATURE/vmalloc features/%>FEATURE/% features/vmalloc vmalloc
 make features/vmalloc
 done features/vmalloc
 prev ast.req
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/vmalloc
 make FEATURE/mmap implicit
-meta FEATURE/mmap features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/mmap mmap
+meta FEATURE/mmap features/%>FEATURE/% features/mmap mmap
 make features/mmap
 done features/mmap
 prev ast.req
@@ -393,7 +392,7 @@
 prev std/limits.h implicit
 make ast_hdr.h implicit
 make FEATURE/hdr
-meta FEATURE/hdr features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/hdr hdr
+meta FEATURE/hdr features/%>FEATURE/% features/hdr hdr
 make features/hdr
 done features/hdr
 prev ast.req
@@ -418,7 +417,7 @@
 prev include/ast_version.h implicit
 done include/ast.h
 done misc/state.c
-meta state.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/state.c state
+meta state.o %.c>%.o misc/state.c state
 prev misc/state.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/state.c
 done state.o generated
@@ -439,7 +438,7 @@
 make std/dirent.h implicit
 make ast_dirent.h implicit
 make FEATURE/dirent
-meta FEATURE/dirent features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/dirent dirent
+meta FEATURE/dirent features/%>FEATURE/% features/dirent dirent
 make features/dirent
 done features/dirent
 prev ast.req
@@ -454,7 +453,7 @@
 prev include/ast.h implicit
 done dir/dirlib.h
 done dir/opendir.c
-meta opendir.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/dir/opendir.c opendir
+meta opendir.o %.c>%.o dir/opendir.c opendir
 prev dir/opendir.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c dir/opendir.c
 done opendir.o generated
@@ -462,7 +461,7 @@
 make dir/readdir.c
 prev dir/dirlib.h implicit
 done dir/readdir.c
-meta readdir.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/dir/readdir.c readdir
+meta readdir.o %.c>%.o dir/readdir.c readdir
 prev dir/readdir.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c dir/readdir.c
 done readdir.o generated
@@ -470,7 +469,7 @@
 make dir/rewinddir.c
 prev dir/dirlib.h implicit
 done dir/rewinddir.c
-meta rewinddir.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/dir/rewinddir.c 
rewinddir
+meta rewinddir.o %.c>%.o dir/rewinddir.c rewinddir
 prev dir/rewinddir.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c dir/rewinddir.c
 done rewinddir.o generated
@@ -478,7 +477,7 @@
 make dir/seekdir.c
 prev dir/dirlib.h implicit
 done dir/seekdir.c
-meta seekdir.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/dir/seekdir.c seekdir
+meta seekdir.o %.c>%.o dir/seekdir.c seekdir
 prev dir/seekdir.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c dir/seekdir.c
 done seekdir.o generated
@@ -486,7 +485,7 @@
 make dir/telldir.c
 prev dir/dirlib.h implicit
 done dir/telldir.c
-meta telldir.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/dir/telldir.c telldir
+meta telldir.o %.c>%.o dir/telldir.c telldir
 prev dir/telldir.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c dir/telldir.c
 done telldir.o generated
@@ -508,7 +507,7 @@
 done include/ast_dir.h dontcare
 prev include/ast.h implicit
 done misc/getcwd.c
-meta getcwd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/getcwd.c getcwd
+meta getcwd.o %.c>%.o misc/getcwd.c getcwd
 prev misc/getcwd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c misc/getcwd.c
 done getcwd.o generated
@@ -530,7 +529,7 @@
 prev include/ast.h implicit
 done misc/findlib.h
 done misc/fastfind.c
-meta fastfind.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/fastfind.c fastfind
+meta fastfind.o %.c>%.o misc/fastfind.c fastfind
 prev misc/fastfind.c
 exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} 
-D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/fastfind.c
 done fastfind.o generated
@@ -544,7 +543,7 @@
 prev include/ast.h implicit
 done hash/hashlib.h
 done hash/hashalloc.c
-meta hashalloc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/hashalloc.c 
hashalloc
+meta hashalloc.o %.c>%.o hash/hashalloc.c hashalloc
 prev hash/hashalloc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/hashalloc.c
 done hashalloc.o generated
@@ -552,7 +551,7 @@
 make hash/hashdump.c
 prev hash/hashlib.h implicit
 done hash/hashdump.c
-meta hashdump.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/hashdump.c hashdump
+meta hashdump.o %.c>%.o hash/hashdump.c hashdump
 prev hash/hashdump.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/hashdump.c
 done hashdump.o generated
@@ -560,7 +559,7 @@
 make hash/hashfree.c
 prev hash/hashlib.h implicit
 done hash/hashfree.c
-meta hashfree.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/hashfree.c hashfree
+meta hashfree.o %.c>%.o hash/hashfree.c hashfree
 prev hash/hashfree.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/hashfree.c
 done hashfree.o generated
@@ -568,7 +567,7 @@
 make hash/hashlast.c
 prev hash/hashlib.h implicit
 done hash/hashlast.c
-meta hashlast.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/hashlast.c hashlast
+meta hashlast.o %.c>%.o hash/hashlast.c hashlast
 prev hash/hashlast.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/hashlast.c
 done hashlast.o generated
@@ -576,7 +575,7 @@
 make hash/hashlook.c
 prev hash/hashlib.h implicit
 done hash/hashlook.c
-meta hashlook.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/hashlook.c hashlook
+meta hashlook.o %.c>%.o hash/hashlook.c hashlook
 prev hash/hashlook.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/hashlook.c
 done hashlook.o generated
@@ -584,7 +583,7 @@
 make hash/hashscan.c
 prev hash/hashlib.h implicit
 done hash/hashscan.c
-meta hashscan.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/hashscan.c hashscan
+meta hashscan.o %.c>%.o hash/hashscan.c hashscan
 prev hash/hashscan.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/hashscan.c
 done hashscan.o generated
@@ -592,7 +591,7 @@
 make hash/hashsize.c
 prev hash/hashlib.h implicit
 done hash/hashsize.c
-meta hashsize.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/hashsize.c hashsize
+meta hashsize.o %.c>%.o hash/hashsize.c hashsize
 prev hash/hashsize.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/hashsize.c
 done hashsize.o generated
@@ -600,7 +599,7 @@
 make hash/hashview.c
 prev hash/hashlib.h implicit
 done hash/hashview.c
-meta hashview.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/hashview.c hashview
+meta hashview.o %.c>%.o hash/hashview.c hashview
 prev hash/hashview.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/hashview.c
 done hashview.o generated
@@ -608,7 +607,7 @@
 make hash/hashwalk.c
 prev hash/hashlib.h implicit
 done hash/hashwalk.c
-meta hashwalk.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/hashwalk.c hashwalk
+meta hashwalk.o %.c>%.o hash/hashwalk.c hashwalk
 prev hash/hashwalk.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/hashwalk.c
 done hashwalk.o generated
@@ -616,7 +615,7 @@
 make hash/memhash.c
 prev hash/hashlib.h implicit
 done hash/memhash.c
-meta memhash.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/memhash.c memhash
+meta memhash.o %.c>%.o hash/memhash.c memhash
 prev hash/memhash.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/memhash.c
 done memhash.o generated
@@ -624,7 +623,7 @@
 make hash/memsum.c
 prev hash/hashlib.h implicit
 done hash/memsum.c
-meta memsum.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/memsum.c memsum
+meta memsum.o %.c>%.o hash/memsum.c memsum
 prev hash/memsum.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/memsum.c
 done memsum.o generated
@@ -632,7 +631,7 @@
 make hash/strhash.c
 prev hash/hashlib.h implicit
 done hash/strhash.c
-meta strhash.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/strhash.c strhash
+meta strhash.o %.c>%.o hash/strhash.c strhash
 prev hash/strhash.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/strhash.c
 done strhash.o generated
@@ -642,7 +641,7 @@
 done include/hashkey.h
 prev include/ast.h implicit
 done hash/strkey.c
-meta strkey.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/strkey.c strkey
+meta strkey.o %.c>%.o hash/strkey.c strkey
 prev hash/strkey.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c hash/strkey.c
 done strkey.o generated
@@ -650,7 +649,7 @@
 make hash/strsum.c
 prev hash/hashlib.h implicit
 done hash/strsum.c
-meta strsum.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/hash/strsum.c strsum
+meta strsum.o %.c>%.o hash/strsum.c strsum
 prev hash/strsum.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ihash -Iinclude -Istd 
-D_PACKAGE_ast -c hash/strsum.c
 done strsum.o generated
@@ -659,7 +658,7 @@
 make include/ccode.h implicit
 make ast_ccode.h implicit
 make FEATURE/ccode
-meta FEATURE/ccode features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/ccode ccode
+meta FEATURE/ccode features/%>FEATURE/% features/ccode ccode
 make features/ccode
 done features/ccode
 prev ast.req
@@ -671,7 +670,7 @@
 done include/ccode.h
 prev include/ast.h implicit
 done string/stracmp.c
-meta stracmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/stracmp.c stracmp
+meta stracmp.o %.c>%.o string/stracmp.c stracmp
 prev string/stracmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/stracmp.c
 done stracmp.o generated
@@ -680,7 +679,7 @@
 prev include/ccode.h implicit
 prev include/ast.h implicit
 done string/strnacmp.c
-meta strnacmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strnacmp.c 
strnacmp
+meta strnacmp.o %.c>%.o string/strnacmp.c strnacmp
 prev string/strnacmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strnacmp.c
 done strnacmp.o generated
@@ -689,7 +688,7 @@
 prev include/ccode.h implicit
 prev include/ast.h implicit
 done string/ccmap.c
-meta ccmap.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/ccmap.c ccmap
+meta ccmap.o %.c>%.o string/ccmap.c ccmap
 prev string/ccmap.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/ccmap.c
 done ccmap.o generated
@@ -698,7 +697,7 @@
 prev include/ccode.h implicit
 prev include/ast.h implicit
 done string/ccmapid.c
-meta ccmapid.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/ccmapid.c ccmapid
+meta ccmapid.o %.c>%.o string/ccmapid.c ccmapid
 prev string/ccmapid.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/ccmapid.c
 done ccmapid.o generated
@@ -707,7 +706,7 @@
 prev include/ccode.h implicit
 prev include/ast.h implicit
 done string/ccnative.c
-meta ccnative.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/ccnative.c 
ccnative
+meta ccnative.o %.c>%.o string/ccnative.c ccnative
 prev string/ccnative.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/ccnative.c
 done ccnative.o generated
@@ -717,7 +716,7 @@
 prev include/ccode.h implicit
 prev include/ast.h implicit
 done string/chresc.c
-meta chresc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/chresc.c chresc
+meta chresc.o %.c>%.o string/chresc.c chresc
 prev string/chresc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/chresc.c
 done chresc.o generated
@@ -725,7 +724,7 @@
 make string/chrtoi.c
 prev include/ast.h implicit
 done string/chrtoi.c
-meta chrtoi.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/chrtoi.c chrtoi
+meta chrtoi.o %.c>%.o string/chrtoi.c chrtoi
 prev string/chrtoi.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/chrtoi.c
 done chrtoi.o generated
@@ -733,7 +732,7 @@
 make string/streval.c
 prev include/ast.h implicit
 done string/streval.c
-meta streval.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/streval.c streval
+meta streval.o %.c>%.o string/streval.c streval
 prev string/streval.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/streval.c
 done streval.o generated
@@ -741,7 +740,7 @@
 make string/strexpr.c
 prev include/ast.h implicit
 done string/strexpr.c
-meta strexpr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strexpr.c strexpr
+meta strexpr.o %.c>%.o string/strexpr.c strexpr
 prev string/strexpr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strexpr.c
 done strexpr.o generated
@@ -750,7 +749,7 @@
 prev include/regex.h implicit
 prev include/ast.h implicit
 done string/strmatch.c
-meta strmatch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strmatch.c 
strmatch
+meta strmatch.o %.c>%.o string/strmatch.c strmatch
 prev string/strmatch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strmatch.c
 done strmatch.o generated
@@ -758,7 +757,7 @@
 make string/strcopy.c
 prev include/ast.h implicit
 done string/strcopy.c
-meta strcopy.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strcopy.c strcopy
+meta strcopy.o %.c>%.o string/strcopy.c strcopy
 prev string/strcopy.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strcopy.c
 done strcopy.o generated
@@ -773,7 +772,7 @@
 prev include/ast.h implicit
 done string/modelib.h
 done string/modei.c
-meta modei.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/modei.c modei
+meta modei.o %.c>%.o string/modei.c modei
 prev string/modei.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Istring -Iinclude -Istd 
-D_PACKAGE_ast -c string/modei.c
 done modei.o generated
@@ -781,7 +780,7 @@
 make string/modex.c
 prev string/modelib.h implicit
 done string/modex.c
-meta modex.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/modex.c modex
+meta modex.o %.c>%.o string/modex.c modex
 prev string/modex.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Istring -Iinclude -Istd 
-D_PACKAGE_ast -c string/modex.c
 done modex.o generated
@@ -789,7 +788,7 @@
 make string/strmode.c
 prev string/modelib.h implicit
 done string/strmode.c
-meta strmode.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strmode.c strmode
+meta strmode.o %.c>%.o string/strmode.c strmode
 prev string/strmode.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Istring -Iinclude -Istd 
-D_PACKAGE_ast -c string/strmode.c
 done strmode.o generated
@@ -797,7 +796,7 @@
 make string/strlcat.c
 prev include/ast.h implicit
 done string/strlcat.c
-meta strlcat.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strlcat.c strlcat
+meta strlcat.o %.c>%.o string/strlcat.c strlcat
 prev string/strlcat.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strlcat.c
 done strlcat.o generated
@@ -805,7 +804,7 @@
 make string/strlcpy.c
 prev include/ast.h implicit
 done string/strlcpy.c
-meta strlcpy.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strlcpy.c strlcpy
+meta strlcpy.o %.c>%.o string/strlcpy.c strlcpy
 prev string/strlcpy.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strlcpy.c
 done strlcpy.o generated
@@ -813,7 +812,7 @@
 make string/strlook.c
 prev include/ast.h implicit
 done string/strlook.c
-meta strlook.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strlook.c strlook
+meta strlook.o %.c>%.o string/strlook.c strlook
 prev string/strlook.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strlook.c
 done strlook.o generated
@@ -821,7 +820,7 @@
 make string/strncopy.c
 prev include/ast.h implicit
 done string/strncopy.c
-meta strncopy.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strncopy.c 
strncopy
+meta strncopy.o %.c>%.o string/strncopy.c strncopy
 prev string/strncopy.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strncopy.c
 done strncopy.o generated
@@ -829,7 +828,7 @@
 make string/strsearch.c
 prev include/ast.h implicit
 done string/strsearch.c
-meta strsearch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strsearch.c 
strsearch
+meta strsearch.o %.c>%.o string/strsearch.c strsearch
 prev string/strsearch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strsearch.c
 done strsearch.o generated
@@ -838,7 +837,7 @@
 prev include/ccode.h implicit
 prev include/ast.h implicit
 done string/strpsearch.c
-meta strpsearch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strpsearch.c 
strpsearch
+meta strpsearch.o %.c>%.o string/strpsearch.c strpsearch
 prev string/strpsearch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strpsearch.c
 done strpsearch.o generated
@@ -846,7 +845,7 @@
 make string/stresc.c
 prev include/ast.h implicit
 done string/stresc.c
-meta stresc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/stresc.c stresc
+meta stresc.o %.c>%.o string/stresc.c stresc
 prev string/stresc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/stresc.c
 done stresc.o generated
@@ -854,7 +853,7 @@
 make string/stropt.c
 prev include/ast.h implicit
 done string/stropt.c
-meta stropt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/stropt.c stropt
+meta stropt.o %.c>%.o string/stropt.c stropt
 prev string/stropt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/stropt.c
 done stropt.o generated
@@ -862,7 +861,7 @@
 make string/strtape.c
 prev include/ast.h implicit
 done string/strtape.c
-meta strtape.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strtape.c strtape
+meta strtape.o %.c>%.o string/strtape.c strtape
 prev string/strtape.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strtape.c
 done strtape.o generated
@@ -873,7 +872,7 @@
 done include/tok.h
 prev include/ast.h implicit
 done string/tok.c
-meta tok.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/tok.c tok
+meta tok.o %.c>%.o string/tok.c tok
 prev string/tok.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/tok.c
 done tok.o generated
@@ -883,7 +882,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done string/tokline.c
-meta tokline.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/tokline.c tokline
+meta tokline.o %.c>%.o string/tokline.c tokline
 prev string/tokline.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/tokline.c
 done tokline.o generated
@@ -892,7 +891,7 @@
 prev include/tok.h implicit
 prev include/ast.h implicit
 done string/tokscan.c
-meta tokscan.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/tokscan.c tokscan
+meta tokscan.o %.c>%.o string/tokscan.c tokscan
 prev string/tokscan.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/tokscan.c
 done tokscan.o generated
@@ -900,7 +899,7 @@
 make path/pathaccess.c
 prev include/ast.h implicit
 done path/pathaccess.c
-meta pathaccess.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathaccess.c 
pathaccess
+meta pathaccess.o %.c>%.o path/pathaccess.c pathaccess
 prev path/pathaccess.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathaccess.c
 done pathaccess.o generated
@@ -908,7 +907,7 @@
 make path/pathcat.c
 prev include/ast.h implicit
 done path/pathcat.c
-meta pathcat.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathcat.c pathcat
+meta pathcat.o %.c>%.o path/pathcat.c pathcat
 prev path/pathcat.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathcat.c
 done pathcat.o generated
@@ -919,7 +918,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done path/pathcanon.c
-meta pathcanon.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathcanon.c 
pathcanon
+meta pathcanon.o %.c>%.o path/pathcanon.c pathcanon
 prev path/pathcanon.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathcanon.c
 done pathcanon.o generated
@@ -928,7 +927,7 @@
 make include/times.h implicit
 make ast_time.h implicit
 make FEATURE/time
-meta FEATURE/time features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/time time
+meta FEATURE/time features/%>FEATURE/% features/time time
 make features/time
 done features/time
 prev ast.req
@@ -942,7 +941,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done path/pathcheck.c
-meta pathcheck.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathcheck.c 
pathcheck
+meta pathcheck.o %.c>%.o path/pathcheck.c pathcheck
 prev path/pathcheck.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathcheck.c
 done pathcheck.o generated
@@ -950,7 +949,7 @@
 make path/pathpath.c
 prev include/ast.h implicit
 done path/pathpath.c
-meta pathpath.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathpath.c pathpath
+meta pathpath.o %.c>%.o path/pathpath.c pathpath
 prev path/pathpath.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathpath.c
 done pathpath.o generated
@@ -991,7 +990,7 @@
 prev include/ast.h implicit
 done port/lclib.h
 done path/pathexists.c
-meta pathexists.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathexists.c 
pathexists
+meta pathexists.o %.c>%.o path/pathexists.c pathexists
 prev path/pathexists.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c path/pathexists.c
 done pathexists.o generated
@@ -1001,7 +1000,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done path/pathfind.c
-meta pathfind.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathfind.c pathfind
+meta pathfind.o %.c>%.o path/pathfind.c pathfind
 prev path/pathfind.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathfind.c
 done pathfind.o generated
@@ -1009,7 +1008,7 @@
 make path/pathkey.c
 make preroot.h implicit
 make FEATURE/preroot
-meta FEATURE/preroot features/%.sh>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/preroot.sh preroot
+meta FEATURE/preroot features/%.sh>FEATURE/% features/preroot.sh preroot
 make features/preroot.sh
 done features/preroot.sh
 prev ast.req
@@ -1020,7 +1019,7 @@
 prev include/fs3d.h implicit
 prev include/ast.h implicit
 done path/pathkey.c
-meta pathkey.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathkey.c pathkey
+meta pathkey.o %.c>%.o path/pathkey.c pathkey
 prev path/pathkey.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathkey.c
 done pathkey.o generated
@@ -1033,7 +1032,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done path/pathprobe.c
-meta pathprobe.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathprobe.c 
pathprobe
+meta pathprobe.o %.c>%.o path/pathprobe.c pathprobe
 prev path/pathprobe.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-DHOSTTYPE=\""${mam_cc_HOSTTYPE}"\" -D_PACKAGE_ast -c path/pathprobe.c
 done pathprobe.o generated
@@ -1041,7 +1040,7 @@
 make path/pathrepl.c
 prev include/ast.h implicit
 done path/pathrepl.c
-meta pathrepl.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathrepl.c pathrepl
+meta pathrepl.o %.c>%.o path/pathrepl.c pathrepl
 prev path/pathrepl.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathrepl.c
 done pathrepl.o generated
@@ -1049,7 +1048,7 @@
 make path/pathnative.c
 prev include/ast.h implicit
 done path/pathnative.c
-meta pathnative.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathnative.c 
pathnative
+meta pathnative.o %.c>%.o path/pathnative.c pathnative
 prev path/pathnative.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathnative.c
 done pathnative.o generated
@@ -1057,7 +1056,7 @@
 make path/pathposix.c
 prev include/ast.h implicit
 done path/pathposix.c
-meta pathposix.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathposix.c 
pathposix
+meta pathposix.o %.c>%.o path/pathposix.c pathposix
 prev path/pathposix.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathposix.c
 done pathposix.o generated
@@ -1070,7 +1069,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done path/pathtemp.c
-meta pathtemp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathtemp.c pathtemp
+meta pathtemp.o %.c>%.o path/pathtemp.c pathtemp
 prev path/pathtemp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathtemp.c
 done pathtemp.o generated
@@ -1079,7 +1078,7 @@
 prev std/stdio.h implicit
 prev include/ast.h implicit
 done path/pathtmp.c
-meta pathtmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathtmp.c pathtmp
+meta pathtmp.o %.c>%.o path/pathtmp.c pathtmp
 prev path/pathtmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathtmp.c
 done pathtmp.o generated
@@ -1089,7 +1088,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done path/pathstat.c
-meta pathstat.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathstat.c pathstat
+meta pathstat.o %.c>%.o path/pathstat.c pathstat
 prev path/pathstat.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathstat.c
 done pathstat.o generated
@@ -1100,7 +1099,7 @@
 prev include/ast.h implicit
 done misc/univlib.h
 done path/pathgetlink.c
-meta pathgetlink.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathgetlink.c 
pathgetlink
+meta pathgetlink.o %.c>%.o path/pathgetlink.c pathgetlink
 prev path/pathgetlink.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathgetlink.c
 done pathgetlink.o generated
@@ -1108,7 +1107,7 @@
 make path/pathsetlink.c
 prev misc/univlib.h implicit
 done path/pathsetlink.c
-meta pathsetlink.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathsetlink.c 
pathsetlink
+meta pathsetlink.o %.c>%.o path/pathsetlink.c pathsetlink
 prev path/pathsetlink.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathsetlink.c
 done pathsetlink.o generated
@@ -1116,7 +1115,7 @@
 make path/pathbin.c
 prev include/ast.h implicit
 done path/pathbin.c
-meta pathbin.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathbin.c pathbin
+meta pathbin.o %.c>%.o path/pathbin.c pathbin
 prev path/pathbin.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathbin.c
 done pathbin.o generated
@@ -1124,7 +1123,7 @@
 make path/pathshell.c
 prev include/ast.h implicit
 done path/pathshell.c
-meta pathshell.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathshell.c 
pathshell
+meta pathshell.o %.c>%.o path/pathshell.c pathshell
 prev path/pathshell.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathshell.c
 done pathshell.o generated
@@ -1136,7 +1135,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done path/pathcd.c
-meta pathcd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/path/pathcd.c pathcd
+meta pathcd.o %.c>%.o path/pathcd.c pathcd
 prev path/pathcd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c path/pathcd.c
 done pathcd.o generated
@@ -1145,7 +1144,7 @@
 prev include/fs3d.h implicit
 prev include/ast.h implicit
 done misc/fs3d.c
-meta fs3d.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/fs3d.c fs3d
+meta fs3d.o %.c>%.o misc/fs3d.c fs3d
 prev misc/fs3d.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/fs3d.c
 done fs3d.o generated
@@ -1158,7 +1157,7 @@
 done include/ftwalk.h
 prev include/ast.h implicit
 done misc/ftwalk.c
-meta ftwalk.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/ftwalk.c ftwalk
+meta ftwalk.o %.c>%.o misc/ftwalk.c ftwalk
 prev misc/ftwalk.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/ftwalk.c
 done ftwalk.o generated
@@ -1167,7 +1166,7 @@
 prev include/ftwalk.h implicit
 prev include/ast.h implicit
 done misc/ftwflags.c
-meta ftwflags.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/ftwflags.c ftwflags
+meta ftwflags.o %.c>%.o misc/ftwflags.c ftwflags
 prev misc/ftwflags.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/ftwflags.c
 done ftwflags.o generated
@@ -1179,7 +1178,7 @@
 prev include/ast_dir.h implicit
 prev include/ast.h implicit
 done misc/fts.c
-meta fts.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/fts.c fts
+meta fts.o %.c>%.o misc/fts.c fts
 prev misc/fts.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c misc/fts.c
 done fts.o generated
@@ -1188,7 +1187,7 @@
 prev include/fs3d.h implicit
 prev include/ast.h implicit
 done misc/setenviron.c
-meta setenviron.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/setenviron.c 
setenviron
+meta setenviron.o %.c>%.o misc/setenviron.c setenviron
 prev misc/setenviron.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/setenviron.c
 done setenviron.o generated
@@ -1205,7 +1204,7 @@
 prev include/ast.h implicit
 done misc/optlib.h
 done misc/optget.c
-meta optget.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/optget.c optget
+meta optget.o %.c>%.o misc/optget.c optget
 prev misc/optget.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/optget.c
 done optget.o generated
@@ -1213,7 +1212,7 @@
 make misc/optjoin.c
 prev misc/optlib.h implicit
 done misc/optjoin.c
-meta optjoin.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/optjoin.c optjoin
+meta optjoin.o %.c>%.o misc/optjoin.c optjoin
 prev misc/optjoin.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/optjoin.c
 done optjoin.o generated
@@ -1221,7 +1220,7 @@
 make misc/optesc.c
 prev misc/optlib.h implicit
 done misc/optesc.c
-meta optesc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/optesc.c optesc
+meta optesc.o %.c>%.o misc/optesc.c optesc
 prev misc/optesc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/optesc.c
 done optesc.o generated
@@ -1229,7 +1228,7 @@
 make string/strsort.c
 prev include/ast.h implicit
 done string/strsort.c
-meta strsort.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strsort.c strsort
+meta strsort.o %.c>%.o string/strsort.c strsort
 prev string/strsort.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strsort.c
 done strsort.o generated
@@ -1237,7 +1236,7 @@
 make string/struniq.c
 prev include/ast.h implicit
 done string/struniq.c
-meta struniq.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/struniq.c struniq
+meta struniq.o %.c>%.o string/struniq.c struniq
 prev string/struniq.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/struniq.c
 done struniq.o generated
@@ -1262,7 +1261,7 @@
 prev include/ccode.h implicit
 prev include/ast.h implicit
 done misc/magic.c
-meta magic.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/magic.c magic
+meta magic.o %.c>%.o misc/magic.c magic
 prev misc/magic.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/magic.c
 done magic.o generated
@@ -1279,7 +1278,7 @@
 prev include/ast.h implicit
 done misc/mimelib.h
 done misc/mime.c
-meta mime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/mime.c mime
+meta mime.o %.c>%.o misc/mime.c mime
 prev misc/mime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/mime.c
 done mime.o generated
@@ -1287,7 +1286,7 @@
 make misc/mimetype.c
 prev misc/mimelib.h implicit
 done misc/mimetype.c
-meta mimetype.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/mimetype.c mimetype
+meta mimetype.o %.c>%.o misc/mimetype.c mimetype
 prev misc/mimetype.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/mimetype.c
 done mimetype.o generated
@@ -1295,7 +1294,7 @@
 make misc/signal.c
 make sig.h implicit
 make FEATURE/sig
-meta FEATURE/sig features/%.sh>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/sig.sh sig
+meta FEATURE/sig features/%.sh>FEATURE/% features/sig.sh sig
 make features/sig.sh
 done features/sig.sh
 prev ast.req
@@ -1305,7 +1304,7 @@
 done sig.h generated
 prev include/ast.h implicit
 done misc/signal.c
-meta signal.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/signal.c signal
+meta signal.o %.c>%.o misc/signal.c signal
 prev misc/signal.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/signal.c
 done signal.o generated
@@ -1316,7 +1315,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done misc/systrace.c
-meta systrace.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/systrace.c systrace
+meta systrace.o %.c>%.o misc/systrace.c systrace
 prev misc/systrace.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/systrace.c
 done systrace.o generated
@@ -1331,7 +1330,7 @@
 prev include/ccode.h implicit
 prev port/lclib.h implicit
 done misc/error.c
-meta error.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/error.c error
+meta error.o %.c>%.o misc/error.c error
 prev misc/error.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iinclude -Istd 
-I${INSTALLROOT}/include -DERROR_CATALOG=\""libast"\" -D_PACKAGE_ast -c 
misc/error.c
 done error.o generated
@@ -1339,7 +1338,7 @@
 make misc/errorf.c
 prev include/error.h implicit
 done misc/errorf.c
-meta errorf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/errorf.c errorf
+meta errorf.o %.c>%.o misc/errorf.c errorf
 prev misc/errorf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/errorf.c
 done errorf.o generated
@@ -1347,7 +1346,7 @@
 make misc/errormsg.c
 prev include/error.h implicit
 done misc/errormsg.c
-meta errormsg.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/errormsg.c errormsg
+meta errormsg.o %.c>%.o misc/errormsg.c errormsg
 prev misc/errormsg.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/errormsg.c
 done errormsg.o generated
@@ -1355,7 +1354,7 @@
 make misc/errorx.c
 prev port/lclib.h implicit
 done misc/errorx.c
-meta errorx.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/errorx.c errorx
+meta errorx.o %.c>%.o misc/errorx.c errorx
 prev misc/errorx.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c misc/errorx.c
 done errorx.o generated
@@ -1363,7 +1362,7 @@
 make comp/localeconv.c
 prev port/lclib.h implicit
 done comp/localeconv.c
-meta localeconv.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/localeconv.c 
localeconv
+meta localeconv.o %.c>%.o comp/localeconv.c localeconv
 prev comp/localeconv.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c comp/localeconv.c
 done localeconv.o generated
@@ -1379,7 +1378,7 @@
 done include/mc.h
 prev port/lclib.h implicit
 done comp/setlocale.c
-meta setlocale.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/setlocale.c 
setlocale
+meta setlocale.o %.c>%.o comp/setlocale.c setlocale
 prev comp/setlocale.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c comp/setlocale.c
 done setlocale.o generated
@@ -1393,7 +1392,7 @@
 prev include/cdt.h implicit
 prev port/lclib.h implicit
 done misc/translate.c
-meta translate.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/translate.c 
translate
+meta translate.o %.c>%.o misc/translate.c translate
 prev misc/translate.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c misc/translate.c
 done translate.o generated
@@ -1402,7 +1401,7 @@
 make std/iconv.h implicit
 make ast_iconv.h implicit
 make FEATURE/iconv
-meta FEATURE/iconv features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/iconv iconv
+meta FEATURE/iconv features/%>FEATURE/% features/iconv iconv
 make features/iconv
 done features/iconv
 prev ast.req
@@ -1419,7 +1418,7 @@
 prev include/mc.h implicit
 prev include/ast.h implicit
 done comp/catopen.c
-meta catopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/catopen.c catopen
+meta catopen.o %.c>%.o comp/catopen.c catopen
 prev comp/catopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/catopen.c
 done catopen.o generated
@@ -1432,7 +1431,7 @@
 prev std/dirent.h implicit
 prev include/ast.h implicit
 done comp/iconv.c
-meta iconv.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/iconv.c iconv
+meta iconv.o %.c>%.o comp/iconv.c iconv
 prev comp/iconv.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c comp/iconv.c
 done iconv.o generated
@@ -1443,7 +1442,7 @@
 prev include/ast_windows.h implicit
 prev port/lclib.h implicit
 done port/lc.c
-meta lc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/lc.c lc
+meta lc.o %.c>%.o port/lc.c lc
 prev port/lc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c port/lc.c
 done lc.o generated
@@ -1465,7 +1464,7 @@
 prev ast_wchar.h implicit
 done std/wchar.h dontcare
 make FEATURE/float implicit
-meta FEATURE/float features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/float float
+meta FEATURE/float features/%>FEATURE/% features/float float
 make features/float
 done features/float
 prev ast.req
@@ -1495,7 +1494,7 @@
 prev FEATURE/common implicit
 prev FEATURE/mmap implicit
 make FEATURE/sfio implicit
-meta FEATURE/sfio features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/sfio sfio
+meta FEATURE/sfio features/%>FEATURE/% features/sfio sfio
 make features/sfio
 done features/sfio
 prev ast.req
@@ -1503,7 +1502,7 @@
 done FEATURE/sfio dontcare generated
 done sfio/sfhdr.h
 done port/mc.c
-meta mc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/mc.c mc
+meta mc.o %.c>%.o port/mc.c mc
 prev port/mc.c
 exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} 
-D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c port/mc.c
 done mc.o generated
@@ -1511,7 +1510,7 @@
 make misc/liberror.c
 prev include/error.h implicit
 done misc/liberror.c
-meta liberror.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/liberror.c liberror
+meta liberror.o %.c>%.o misc/liberror.c liberror
 prev misc/liberror.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/liberror.c
 done liberror.o generated
@@ -1519,7 +1518,7 @@
 make misc/libevent.c
 prev include/error.h implicit
 done misc/libevent.c
-meta libevent.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/libevent.c libevent
+meta libevent.o %.c>%.o misc/libevent.c libevent
 prev misc/libevent.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/libevent.c
 done libevent.o generated
@@ -1527,7 +1526,7 @@
 make string/base64.c
 prev include/ast.h implicit
 done string/base64.c
-meta base64.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/base64.c base64
+meta base64.o %.c>%.o string/base64.c base64
 prev string/base64.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/base64.c
 done base64.o generated
@@ -1537,7 +1536,7 @@
 prev include/ast.h implicit
 done include/recfmt.h
 done misc/recfmt.c
-meta recfmt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/recfmt.c recfmt
+meta recfmt.o %.c>%.o misc/recfmt.c recfmt
 prev misc/recfmt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/recfmt.c
 done recfmt.o generated
@@ -1545,7 +1544,7 @@
 make misc/recstr.c
 prev include/recfmt.h implicit
 done misc/recstr.c
-meta recstr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/recstr.c recstr
+meta recstr.o %.c>%.o misc/recstr.c recstr
 prev misc/recstr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/recstr.c
 done recstr.o generated
@@ -1553,7 +1552,7 @@
 make misc/reclen.c
 prev include/recfmt.h implicit
 done misc/reclen.c
-meta reclen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/reclen.c reclen
+meta reclen.o %.c>%.o misc/reclen.c reclen
 prev misc/reclen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/reclen.c
 done reclen.o generated
@@ -1561,7 +1560,7 @@
 make misc/fmtrec.c
 prev include/recfmt.h implicit
 done misc/fmtrec.c
-meta fmtrec.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/fmtrec.c fmtrec
+meta fmtrec.o %.c>%.o misc/fmtrec.c fmtrec
 prev misc/fmtrec.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/fmtrec.c
 done fmtrec.o generated
@@ -1569,7 +1568,7 @@
 make string/fmtbase.c
 prev include/ast.h implicit
 done string/fmtbase.c
-meta fmtbase.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtbase.c fmtbase
+meta fmtbase.o %.c>%.o string/fmtbase.c fmtbase
 prev string/fmtbase.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtbase.c
 done fmtbase.o generated
@@ -1577,7 +1576,7 @@
 make string/fmtbuf.c
 prev include/ast.h implicit
 done string/fmtbuf.c
-meta fmtbuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtbuf.c fmtbuf
+meta fmtbuf.o %.c>%.o string/fmtbuf.c fmtbuf
 prev string/fmtbuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtbuf.c
 done fmtbuf.o generated
@@ -1586,7 +1585,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done string/fmtclock.c
-meta fmtclock.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtclock.c 
fmtclock
+meta fmtclock.o %.c>%.o string/fmtclock.c fmtclock
 prev string/fmtclock.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtclock.c
 done fmtclock.o generated
@@ -1595,7 +1594,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done string/fmtdev.c
-meta fmtdev.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtdev.c fmtdev
+meta fmtdev.o %.c>%.o string/fmtdev.c fmtdev
 prev string/fmtdev.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtdev.c
 done fmtdev.o generated
@@ -1603,7 +1602,7 @@
 make string/fmtelapsed.c
 prev include/ast.h implicit
 done string/fmtelapsed.c
-meta fmtelapsed.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtelapsed.c 
fmtelapsed
+meta fmtelapsed.o %.c>%.o string/fmtelapsed.c fmtelapsed
 prev string/fmtelapsed.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtelapsed.c
 done fmtelapsed.o generated
@@ -1611,7 +1610,7 @@
 make string/fmterror.c
 prev include/ast.h implicit
 done string/fmterror.c
-meta fmterror.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmterror.c 
fmterror
+meta fmterror.o %.c>%.o string/fmterror.c fmterror
 prev string/fmterror.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmterror.c
 done fmterror.o generated
@@ -1620,7 +1619,7 @@
 prev include/ccode.h implicit
 prev include/ast.h implicit
 done string/fmtesc.c
-meta fmtesc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtesc.c fmtesc
+meta fmtesc.o %.c>%.o string/fmtesc.c fmtesc
 prev string/fmtesc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtesc.c
 done fmtesc.o generated
@@ -1628,7 +1627,7 @@
 make string/fmtfmt.c
 prev include/ast.h implicit
 done string/fmtfmt.c
-meta fmtfmt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtfmt.c fmtfmt
+meta fmtfmt.o %.c>%.o string/fmtfmt.c fmtfmt
 prev string/fmtfmt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtfmt.c
 done fmtfmt.o generated
@@ -1641,7 +1640,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done string/fmtfs.c
-meta fmtfs.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtfs.c fmtfs
+meta fmtfs.o %.c>%.o string/fmtfs.c fmtfs
 prev string/fmtfs.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtfs.c
 done fmtfs.o generated
@@ -1649,7 +1648,7 @@
 make string/fmtident.c
 prev include/ast.h implicit
 done string/fmtident.c
-meta fmtident.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtident.c 
fmtident
+meta fmtident.o %.c>%.o string/fmtident.c fmtident
 prev string/fmtident.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtident.c
 done fmtident.o generated
@@ -1657,7 +1656,7 @@
 make string/fmtip4.c
 prev include/ast.h implicit
 done string/fmtip4.c
-meta fmtip4.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtip4.c fmtip4
+meta fmtip4.o %.c>%.o string/fmtip4.c fmtip4
 prev string/fmtip4.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtip4.c
 done fmtip4.o generated
@@ -1667,7 +1666,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done string/fmtls.c
-meta fmtls.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtls.c fmtls
+meta fmtls.o %.c>%.o string/fmtls.c fmtls
 prev string/fmtls.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtls.c
 done fmtls.o generated
@@ -1675,7 +1674,7 @@
 make string/fmtmatch.c
 prev include/ast.h implicit
 done string/fmtmatch.c
-meta fmtmatch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtmatch.c 
fmtmatch
+meta fmtmatch.o %.c>%.o string/fmtmatch.c fmtmatch
 prev string/fmtmatch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtmatch.c
 done fmtmatch.o generated
@@ -1683,7 +1682,7 @@
 make string/fmtmode.c
 prev string/modelib.h implicit
 done string/fmtmode.c
-meta fmtmode.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtmode.c fmtmode
+meta fmtmode.o %.c>%.o string/fmtmode.c fmtmode
 prev string/fmtmode.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Istring -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtmode.c
 done fmtmode.o generated
@@ -1691,7 +1690,7 @@
 make string/fmtnum.c
 prev include/ast.h implicit
 done string/fmtnum.c
-meta fmtnum.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtnum.c fmtnum
+meta fmtnum.o %.c>%.o string/fmtnum.c fmtnum
 prev string/fmtnum.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtnum.c
 done fmtnum.o generated
@@ -1700,7 +1699,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done string/fmtperm.c
-meta fmtperm.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtperm.c fmtperm
+meta fmtperm.o %.c>%.o string/fmtperm.c fmtperm
 prev string/fmtperm.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtperm.c
 done fmtperm.o generated
@@ -1708,7 +1707,7 @@
 make string/fmtre.c
 prev include/ast.h implicit
 done string/fmtre.c
-meta fmtre.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtre.c fmtre
+meta fmtre.o %.c>%.o string/fmtre.c fmtre
 prev string/fmtre.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtre.c
 done fmtre.o generated
@@ -1716,7 +1715,7 @@
 make string/fmttime.c
 prev include/tm.h implicit
 done string/fmttime.c
-meta fmttime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmttime.c fmttime
+meta fmttime.o %.c>%.o string/fmttime.c fmttime
 prev string/fmttime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmttime.c
 done fmttime.o generated
@@ -1726,7 +1725,7 @@
 prev include/cdt.h implicit
 prev include/ast.h implicit
 done string/fmtuid.c
-meta fmtuid.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtuid.c fmtuid
+meta fmtuid.o %.c>%.o string/fmtuid.c fmtuid
 prev string/fmtuid.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtuid.c
 done fmtuid.o generated
@@ -1736,7 +1735,7 @@
 prev include/cdt.h implicit
 prev include/ast.h implicit
 done string/fmtgid.c
-meta fmtgid.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtgid.c fmtgid
+meta fmtgid.o %.c>%.o string/fmtgid.c fmtgid
 prev string/fmtgid.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtgid.c
 done fmtgid.o generated
@@ -1745,7 +1744,7 @@
 prev sig.h implicit
 prev include/ast.h implicit
 done string/fmtsignal.c
-meta fmtsignal.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtsignal.c 
fmtsignal
+meta fmtsignal.o %.c>%.o string/fmtsignal.c fmtsignal
 prev string/fmtsignal.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtsignal.c
 done fmtsignal.o generated
@@ -1753,7 +1752,7 @@
 make string/fmtscale.c
 prev include/ast.h implicit
 done string/fmtscale.c
-meta fmtscale.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtscale.c 
fmtscale
+meta fmtscale.o %.c>%.o string/fmtscale.c fmtscale
 prev string/fmtscale.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtscale.c
 done fmtscale.o generated
@@ -1761,7 +1760,7 @@
 make string/fmttmx.c
 make tv.h implicit
 make FEATURE/tv
-meta FEATURE/tv features/%>FEATURE/% ${PACKAGEROOT}/src/lib/libast/features/tv 
tv
+meta FEATURE/tv features/%>FEATURE/% features/tv tv
 make features/tv
 done features/tv
 prev ast.req
@@ -1773,7 +1772,7 @@
 done tv.h generated
 make tmx.h implicit
 make FEATURE/tmx
-meta FEATURE/tmx features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/tmx tmx
+meta FEATURE/tmx features/%>FEATURE/% features/tmx tmx
 make features/tmx
 prev FEATURE/common implicit
 done features/tmx
@@ -1787,7 +1786,7 @@
 prev include/tm.h implicit
 done tmx.h generated
 done string/fmttmx.c
-meta fmttmx.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmttmx.c fmttmx
+meta fmttmx.o %.c>%.o string/fmttmx.c fmttmx
 prev string/fmttmx.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmttmx.c
 done fmttmx.o generated
@@ -1796,7 +1795,7 @@
 prev include/tm.h implicit
 prev tv.h implicit
 done string/fmttv.c
-meta fmttv.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmttv.c fmttv
+meta fmttv.o %.c>%.o string/fmttv.c fmttv
 prev string/fmttv.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmttv.c
 done fmttv.o generated
@@ -1804,7 +1803,7 @@
 make string/fmtversion.c
 prev include/ast.h implicit
 done string/fmtversion.c
-meta fmtversion.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/fmtversion.c 
fmtversion
+meta fmtversion.o %.c>%.o string/fmtversion.c fmtversion
 prev string/fmtversion.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/fmtversion.c
 done fmtversion.o generated
@@ -1812,7 +1811,7 @@
 make string/strelapsed.c
 prev include/ast.h implicit
 done string/strelapsed.c
-meta strelapsed.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strelapsed.c 
strelapsed
+meta strelapsed.o %.c>%.o string/strelapsed.c strelapsed
 prev string/strelapsed.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strelapsed.c
 done strelapsed.o generated
@@ -1822,7 +1821,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done string/strperm.c
-meta strperm.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strperm.c strperm
+meta strperm.o %.c>%.o string/strperm.c strperm
 prev string/strperm.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strperm.c
 done strperm.o generated
@@ -1831,7 +1830,7 @@
 prev include/cdt.h implicit
 prev include/ast.h implicit
 done string/struid.c
-meta struid.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/struid.c struid
+meta struid.o %.c>%.o string/struid.c struid
 prev string/struid.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/struid.c
 done struid.o generated
@@ -1840,7 +1839,7 @@
 prev include/cdt.h implicit
 prev include/ast.h implicit
 done string/strgid.c
-meta strgid.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strgid.c strgid
+meta strgid.o %.c>%.o string/strgid.c strgid
 prev string/strgid.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strgid.c
 done strgid.o generated
@@ -1848,7 +1847,7 @@
 make string/strtoip4.c
 prev include/ast.h implicit
 done string/strtoip4.c
-meta strtoip4.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strtoip4.c 
strtoip4
+meta strtoip4.o %.c>%.o string/strtoip4.c strtoip4
 prev string/strtoip4.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strtoip4.c
 done strtoip4.o generated
@@ -1858,7 +1857,7 @@
 done include/stack.h
 prev include/ast.h implicit
 done misc/stack.c
-meta stack.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/stack.c stack
+meta stack.o %.c>%.o misc/stack.c stack
 prev misc/stack.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/stack.c
 done stack.o generated
@@ -1867,7 +1866,7 @@
 prev include/stk.h implicit
 make align.h implicit
 make FEATURE/align
-meta FEATURE/align features/%.c>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/align.c align
+meta FEATURE/align features/%.c>FEATURE/% features/align.c align
 make features/align.c
 prev FEATURE/common implicit
 done features/align.c
@@ -1879,7 +1878,7 @@
 prev include/ast.h implicit
 prev include/sfio_t.h implicit
 done misc/stk.c
-meta stk.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/stk.c stk
+meta stk.o %.c>%.o misc/stk.c stk
 prev misc/stk.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/stk.c
 done stk.o generated
@@ -1888,7 +1887,7 @@
 prev include/swap.h implicit
 prev include/ast.h implicit
 done string/swapget.c
-meta swapget.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/swapget.c swapget
+meta swapget.o %.c>%.o string/swapget.c swapget
 prev string/swapget.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/swapget.c
 done swapget.o generated
@@ -1897,7 +1896,7 @@
 prev include/swap.h implicit
 prev include/ast.h implicit
 done string/swapmem.c
-meta swapmem.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/swapmem.c swapmem
+meta swapmem.o %.c>%.o string/swapmem.c swapmem
 prev string/swapmem.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/swapmem.c
 done swapmem.o generated
@@ -1906,7 +1905,7 @@
 prev include/swap.h implicit
 prev include/ast.h implicit
 done string/swapop.c
-meta swapop.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/swapop.c swapop
+meta swapop.o %.c>%.o string/swapop.c swapop
 prev string/swapop.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/swapop.c
 done swapop.o generated
@@ -1915,14 +1914,14 @@
 prev include/swap.h implicit
 prev include/ast.h implicit
 done string/swapput.c
-meta swapput.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/swapput.c swapput
+meta swapput.o %.c>%.o string/swapput.c swapput
 prev string/swapput.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/swapput.c
 done swapput.o generated
 make sigdata.o
 make misc/sigdata.c
 make FEATURE/signal implicit
-meta FEATURE/signal features/%.c>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/signal.c signal
+meta FEATURE/signal features/%.c>FEATURE/% features/signal.c signal
 make features/signal.c
 prev std/stdio.h implicit
 done features/signal.c
@@ -1932,7 +1931,7 @@
 prev sig.h implicit
 prev include/ast.h implicit
 done misc/sigdata.c
-meta sigdata.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/sigdata.c sigdata
+meta sigdata.o %.c>%.o misc/sigdata.c sigdata
 prev misc/sigdata.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/sigdata.c
 done sigdata.o generated
@@ -1941,7 +1940,7 @@
 prev sig.h implicit
 prev include/ast.h implicit
 done misc/sigcrit.c
-meta sigcrit.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/sigcrit.c sigcrit
+meta sigcrit.o %.c>%.o misc/sigcrit.c sigcrit
 prev misc/sigcrit.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c misc/sigcrit.c
 done sigcrit.o generated
@@ -1950,7 +1949,7 @@
 prev sig.h implicit
 prev include/ast.h implicit
 done comp/sigunblock.c
-meta sigunblock.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/sigunblock.c 
sigunblock
+meta sigunblock.o %.c>%.o comp/sigunblock.c sigunblock
 prev comp/sigunblock.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/sigunblock.c
 done sigunblock.o generated
@@ -1964,7 +1963,7 @@
 prev include/ast.h implicit
 done misc/proclib.h
 done misc/procopen.c
-meta procopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/procopen.c procopen
+meta procopen.o %.c>%.o misc/procopen.c procopen
 prev misc/procopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/procopen.c
 done procopen.o generated
@@ -1979,7 +1978,7 @@
 done include/wait.h
 prev misc/proclib.h implicit
 done misc/procclose.c
-meta procclose.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/procclose.c 
procclose
+meta procclose.o %.c>%.o misc/procclose.c procclose
 prev misc/procclose.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/procclose.c
 done procclose.o generated
@@ -1987,7 +1986,7 @@
 make misc/procrun.c
 prev misc/proclib.h implicit
 done misc/procrun.c
-meta procrun.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/procrun.c procrun
+meta procrun.o %.c>%.o misc/procrun.c procrun
 prev misc/procrun.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/procrun.c
 done procrun.o generated
@@ -1995,7 +1994,7 @@
 make misc/procfree.c
 prev misc/proclib.h implicit
 done misc/procfree.c
-meta procfree.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/procfree.c procfree
+meta procfree.o %.c>%.o misc/procfree.c procfree
 prev misc/procfree.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast -c misc/procfree.c
 done procfree.o generated
@@ -2003,7 +2002,7 @@
 make tm/tmdate.c
 prev tmx.h implicit
 done tm/tmdate.c
-meta tmdate.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmdate.c tmdate
+meta tmdate.o %.c>%.o tm/tmdate.c tmdate
 prev tm/tmdate.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmdate.c
 done tmdate.o generated
@@ -2011,7 +2010,7 @@
 make tm/tmequiv.c
 prev include/tm.h implicit
 done tm/tmequiv.c
-meta tmequiv.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmequiv.c tmequiv
+meta tmequiv.o %.c>%.o tm/tmequiv.c tmequiv
 prev tm/tmequiv.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmequiv.c
 done tmequiv.o generated
@@ -2020,7 +2019,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmfix.c
-meta tmfix.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmfix.c tmfix
+meta tmfix.o %.c>%.o tm/tmfix.c tmfix
 prev tm/tmfix.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmfix.c
 done tmfix.o generated
@@ -2028,7 +2027,7 @@
 make tm/tmfmt.c
 prev tmx.h implicit
 done tm/tmfmt.c
-meta tmfmt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmfmt.c tmfmt
+meta tmfmt.o %.c>%.o tm/tmfmt.c tmfmt
 prev tm/tmfmt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmfmt.c
 done tmfmt.o generated
@@ -2037,7 +2036,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmform.c
-meta tmform.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmform.c tmform
+meta tmform.o %.c>%.o tm/tmform.c tmform
 prev tm/tmform.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmform.c
 done tmform.o generated
@@ -2046,14 +2045,14 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmgoff.c
-meta tmgoff.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmgoff.c tmgoff
+meta tmgoff.o %.c>%.o tm/tmgoff.c tmgoff
 prev tm/tmgoff.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmgoff.c
 done tmgoff.o generated
 make tminit.o
 make tm/tminit.c
 make FEATURE/tmlib implicit
-meta FEATURE/tmlib features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/tmlib tmlib
+meta FEATURE/tmlib features/%>FEATURE/% features/tmlib tmlib
 make features/tmlib
 done features/tmlib
 prev ast.req
@@ -2062,7 +2061,7 @@
 prev include/namval.h implicit
 prev include/tm.h implicit
 done tm/tminit.c
-meta tminit.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tminit.c tminit
+meta tminit.o %.c>%.o tm/tminit.c tminit
 prev tm/tminit.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tminit.c
 done tminit.o generated
@@ -2070,7 +2069,7 @@
 make tm/tmleap.c
 prev tmx.h implicit
 done tm/tmleap.c
-meta tmleap.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmleap.c tmleap
+meta tmleap.o %.c>%.o tm/tmleap.c tmleap
 prev tm/tmleap.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmleap.c
 done tmleap.o generated
@@ -2079,7 +2078,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmlex.c
-meta tmlex.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmlex.c tmlex
+meta tmlex.o %.c>%.o tm/tmlex.c tmlex
 prev tm/tmlex.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmlex.c
 done tmlex.o generated
@@ -2095,7 +2094,7 @@
 prev include/cdt.h implicit
 prev include/ast.h implicit
 done tm/tmlocale.c
-meta tmlocale.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmlocale.c tmlocale
+meta tmlocale.o %.c>%.o tm/tmlocale.c tmlocale
 prev tm/tmlocale.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c tm/tmlocale.c
 done tmlocale.o generated
@@ -2103,7 +2102,7 @@
 make tm/tmmake.c
 prev tmx.h implicit
 done tm/tmmake.c
-meta tmmake.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmmake.c tmmake
+meta tmmake.o %.c>%.o tm/tmmake.c tmmake
 prev tm/tmmake.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmmake.c
 done tmmake.o generated
@@ -2112,7 +2111,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmpoff.c
-meta tmpoff.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmpoff.c tmpoff
+meta tmpoff.o %.c>%.o tm/tmpoff.c tmpoff
 prev tm/tmpoff.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmpoff.c
 done tmpoff.o generated
@@ -2120,7 +2119,7 @@
 make tm/tmscan.c
 prev tmx.h implicit
 done tm/tmscan.c
-meta tmscan.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmscan.c tmscan
+meta tmscan.o %.c>%.o tm/tmscan.c tmscan
 prev tm/tmscan.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmscan.c
 done tmscan.o generated
@@ -2130,7 +2129,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmsleep.c
-meta tmsleep.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmsleep.c tmsleep
+meta tmsleep.o %.c>%.o tm/tmsleep.c tmsleep
 prev tm/tmsleep.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmsleep.c
 done tmsleep.o generated
@@ -2138,7 +2137,7 @@
 make tm/tmtime.c
 prev tmx.h implicit
 done tm/tmtime.c
-meta tmtime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmtime.c tmtime
+meta tmtime.o %.c>%.o tm/tmtime.c tmtime
 prev tm/tmtime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmtime.c
 done tmtime.o generated
@@ -2147,7 +2146,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmtype.c
-meta tmtype.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmtype.c tmtype
+meta tmtype.o %.c>%.o tm/tmtype.c tmtype
 prev tm/tmtype.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmtype.c
 done tmtype.o generated
@@ -2155,7 +2154,7 @@
 make tm/tmweek.c
 prev tmx.h implicit
 done tm/tmweek.c
-meta tmweek.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmweek.c tmweek
+meta tmweek.o %.c>%.o tm/tmweek.c tmweek
 prev tm/tmweek.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmweek.c
 done tmweek.o generated
@@ -2164,7 +2163,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmword.c
-meta tmword.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmword.c tmword
+meta tmword.o %.c>%.o tm/tmword.c tmword
 prev tm/tmword.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmword.c
 done tmword.o generated
@@ -2173,7 +2172,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmzone.c
-meta tmzone.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmzone.c tmzone
+meta tmzone.o %.c>%.o tm/tmzone.c tmzone
 prev tm/tmzone.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmzone.c
 done tmzone.o generated
@@ -2181,7 +2180,7 @@
 make tm/tmxdate.c
 prev tmx.h implicit
 done tm/tmxdate.c
-meta tmxdate.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxdate.c tmxdate
+meta tmxdate.o %.c>%.o tm/tmxdate.c tmxdate
 prev tm/tmxdate.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxdate.c
 done tmxdate.o generated
@@ -2189,7 +2188,7 @@
 make tm/tmxfmt.c
 prev tmx.h implicit
 done tm/tmxfmt.c
-meta tmxfmt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxfmt.c tmxfmt
+meta tmxfmt.o %.c>%.o tm/tmxfmt.c tmxfmt
 prev tm/tmxfmt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxfmt.c
 done tmxfmt.o generated
@@ -2198,7 +2197,7 @@
 prev tv.h implicit
 prev tmx.h implicit
 done tm/tmxgettime.c
-meta tmxgettime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxgettime.c 
tmxgettime
+meta tmxgettime.o %.c>%.o tm/tmxgettime.c tmxgettime
 prev tm/tmxgettime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxgettime.c
 done tmxgettime.o generated
@@ -2206,7 +2205,7 @@
 make tm/tmxleap.c
 prev tmx.h implicit
 done tm/tmxleap.c
-meta tmxleap.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxleap.c tmxleap
+meta tmxleap.o %.c>%.o tm/tmxleap.c tmxleap
 prev tm/tmxleap.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxleap.c
 done tmxleap.o generated
@@ -2215,7 +2214,7 @@
 prev FEATURE/tmlib implicit
 prev tmx.h implicit
 done tm/tmxmake.c
-meta tmxmake.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxmake.c tmxmake
+meta tmxmake.o %.c>%.o tm/tmxmake.c tmxmake
 prev tm/tmxmake.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxmake.c
 done tmxmake.o generated
@@ -2223,7 +2222,7 @@
 make tm/tmxscan.c
 prev tmx.h implicit
 done tm/tmxscan.c
-meta tmxscan.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxscan.c tmxscan
+meta tmxscan.o %.c>%.o tm/tmxscan.c tmxscan
 prev tm/tmxscan.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxscan.c
 done tmxscan.o generated
@@ -2232,7 +2231,7 @@
 prev tv.h implicit
 prev tmx.h implicit
 done tm/tmxsettime.c
-meta tmxsettime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxsettime.c 
tmxsettime
+meta tmxsettime.o %.c>%.o tm/tmxsettime.c tmxsettime
 prev tm/tmxsettime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxsettime.c
 done tmxsettime.o generated
@@ -2241,7 +2240,7 @@
 prev tv.h implicit
 prev tmx.h implicit
 done tm/tmxsleep.c
-meta tmxsleep.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxsleep.c tmxsleep
+meta tmxsleep.o %.c>%.o tm/tmxsleep.c tmxsleep
 prev tm/tmxsleep.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxsleep.c
 done tmxsleep.o generated
@@ -2250,7 +2249,7 @@
 prev FEATURE/tmlib implicit
 prev tmx.h implicit
 done tm/tmxtime.c
-meta tmxtime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxtime.c tmxtime
+meta tmxtime.o %.c>%.o tm/tmxtime.c tmxtime
 prev tm/tmxtime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxtime.c
 done tmxtime.o generated
@@ -2259,7 +2258,7 @@
 prev tv.h implicit
 prev tmx.h implicit
 done tm/tmxtouch.c
-meta tmxtouch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmxtouch.c tmxtouch
+meta tmxtouch.o %.c>%.o tm/tmxtouch.c tmxtouch
 prev tm/tmxtouch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tmxtouch.c
 done tmxtouch.o generated
@@ -2267,14 +2266,14 @@
 make tm/tvcmp.c
 prev tv.h implicit
 done tm/tvcmp.c
-meta tvcmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tvcmp.c tvcmp
+meta tvcmp.o %.c>%.o tm/tvcmp.c tvcmp
 prev tm/tvcmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tvcmp.c
 done tvcmp.o generated
 make tvgettime.o
 make tm/tvgettime.c
 make FEATURE/tvlib implicit
-meta FEATURE/tvlib features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/tvlib tvlib
+meta FEATURE/tvlib features/%>FEATURE/% features/tvlib tvlib
 make features/tvlib
 done features/tvlib
 prev ast.req
@@ -2283,7 +2282,7 @@
 prev include/tm.h implicit
 prev tv.h implicit
 done tm/tvgettime.c
-meta tvgettime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tvgettime.c tvgettime
+meta tvgettime.o %.c>%.o tm/tvgettime.c tvgettime
 prev tm/tvgettime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tvgettime.c
 done tvgettime.o generated
@@ -2293,7 +2292,7 @@
 prev include/tm.h implicit
 prev tv.h implicit
 done tm/tvsettime.c
-meta tvsettime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tvsettime.c tvsettime
+meta tvsettime.o %.c>%.o tm/tvsettime.c tvsettime
 prev tm/tvsettime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tvsettime.c
 done tvsettime.o generated
@@ -2303,7 +2302,7 @@
 prev include/tm.h implicit
 prev tv.h implicit
 done tm/tvsleep.c
-meta tvsleep.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tvsleep.c tvsleep
+meta tvsleep.o %.c>%.o tm/tvsleep.c tvsleep
 prev tm/tvsleep.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tvsleep.c
 done tvsleep.o generated
@@ -2316,7 +2315,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done tm/tvtouch.c
-meta tvtouch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tvtouch.c tvtouch
+meta tvtouch.o %.c>%.o tm/tvtouch.c tvtouch
 prev tm/tvtouch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c tm/tvtouch.c
 done tvtouch.o generated
@@ -2326,7 +2325,7 @@
 done include/vecargs.h
 prev include/ast.h implicit
 done vec/vecargs.c
-meta vecargs.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vec/vecargs.c vecargs
+meta vecargs.o %.c>%.o vec/vecargs.c vecargs
 prev vec/vecargs.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c vec/vecargs.c
 done vecargs.o generated
@@ -2336,7 +2335,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done vec/vecfile.c
-meta vecfile.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vec/vecfile.c vecfile
+meta vecfile.o %.c>%.o vec/vecfile.c vecfile
 prev vec/vecfile.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c vec/vecfile.c
 done vecfile.o generated
@@ -2345,7 +2344,7 @@
 prev include/vecargs.h implicit
 prev include/ast.h implicit
 done vec/vecfree.c
-meta vecfree.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vec/vecfree.c vecfree
+meta vecfree.o %.c>%.o vec/vecfree.c vecfree
 prev vec/vecfree.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c vec/vecfree.c
 done vecfree.o generated
@@ -2354,7 +2353,7 @@
 prev include/vecargs.h implicit
 prev include/ast.h implicit
 done vec/vecload.c
-meta vecload.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vec/vecload.c vecload
+meta vecload.o %.c>%.o vec/vecload.c vecload
 prev vec/vecload.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c vec/vecload.c
 done vecload.o generated
@@ -2363,7 +2362,7 @@
 prev include/vecargs.h implicit
 prev include/ast.h implicit
 done vec/vecstring.c
-meta vecstring.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vec/vecstring.c 
vecstring
+meta vecstring.o %.c>%.o vec/vecstring.c vecstring
 prev vec/vecstring.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c vec/vecstring.c
 done vecstring.o generated
@@ -2371,7 +2370,7 @@
 make misc/univdata.c
 prev misc/univlib.h implicit
 done misc/univdata.c
-meta univdata.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/univdata.c univdata
+meta univdata.o %.c>%.o misc/univdata.c univdata
 prev misc/univdata.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-D_PACKAGE_ast  -c misc/univdata.c
 done univdata.o generated
@@ -2381,7 +2380,7 @@
 prev include/times.h implicit
 prev include/ast.h implicit
 done port/touch.c
-meta touch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/touch.c touch
+meta touch.o %.c>%.o port/touch.c touch
 prev port/touch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c port/touch.c
 done touch.o generated
@@ -2396,7 +2395,7 @@
 prev include/mnt.h implicit
 prev include/ast.h implicit
 done port/mnt.c
-meta mnt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/mnt.c mnt
+meta mnt.o %.c>%.o port/mnt.c mnt
 prev port/mnt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c port/mnt.c
 done mnt.o generated
@@ -2404,7 +2403,7 @@
 make comp/memccpy.c
 prev include/ast.h implicit
 done comp/memccpy.c
-meta memccpy.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/memccpy.c memccpy
+meta memccpy.o %.c>%.o comp/memccpy.c memccpy
 prev comp/memccpy.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/memccpy.c
 done memccpy.o generated
@@ -2412,7 +2411,7 @@
 make comp/memchr.c
 prev include/ast.h implicit
 done comp/memchr.c
-meta memchr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/memchr.c memchr
+meta memchr.o %.c>%.o comp/memchr.c memchr
 prev comp/memchr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/memchr.c
 done memchr.o generated
@@ -2420,7 +2419,7 @@
 make comp/memcmp.c
 prev include/ast.h implicit
 done comp/memcmp.c
-meta memcmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/memcmp.c memcmp
+meta memcmp.o %.c>%.o comp/memcmp.c memcmp
 prev comp/memcmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/memcmp.c
 done memcmp.o generated
@@ -2428,7 +2427,7 @@
 make comp/memcpy.c
 prev include/ast.h implicit
 done comp/memcpy.c
-meta memcpy.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/memcpy.c memcpy
+meta memcpy.o %.c>%.o comp/memcpy.c memcpy
 prev comp/memcpy.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/memcpy.c
 done memcpy.o generated
@@ -2436,7 +2435,7 @@
 make string/memdup.c
 prev include/ast.h implicit
 done string/memdup.c
-meta memdup.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/memdup.c memdup
+meta memdup.o %.c>%.o string/memdup.c memdup
 prev string/memdup.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/memdup.c
 done memdup.o generated
@@ -2444,7 +2443,7 @@
 make comp/memmove.c
 prev include/ast.h implicit
 done comp/memmove.c
-meta memmove.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/memmove.c memmove
+meta memmove.o %.c>%.o comp/memmove.c memmove
 prev comp/memmove.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/memmove.c
 done memmove.o generated
@@ -2452,7 +2451,7 @@
 make comp/memset.c
 prev include/ast.h implicit
 done comp/memset.c
-meta memset.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/memset.c memset
+meta memset.o %.c>%.o comp/memset.c memset
 prev comp/memset.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/memset.c
 done memset.o generated
@@ -2463,7 +2462,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/mkdir.c
-meta mkdir.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/mkdir.c mkdir
+meta mkdir.o %.c>%.o comp/mkdir.c mkdir
 prev comp/mkdir.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/mkdir.c
 done mkdir.o generated
@@ -2473,7 +2472,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/mkfifo.c
-meta mkfifo.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/mkfifo.c mkfifo
+meta mkfifo.o %.c>%.o comp/mkfifo.c mkfifo
 prev comp/mkfifo.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/mkfifo.c
 done mkfifo.o generated
@@ -2483,7 +2482,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/mknod.c
-meta mknod.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/mknod.c mknod
+meta mknod.o %.c>%.o comp/mknod.c mknod
 prev comp/mknod.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/mknod.c
 done mknod.o generated
@@ -2493,7 +2492,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/rmdir.c
-meta rmdir.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/rmdir.c rmdir
+meta rmdir.o %.c>%.o comp/rmdir.c rmdir
 prev comp/rmdir.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/rmdir.c
 done rmdir.o generated
@@ -2501,7 +2500,7 @@
 make comp/remove.c
 prev include/ast.h implicit
 done comp/remove.c
-meta remove.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/remove.c remove
+meta remove.o %.c>%.o comp/remove.c remove
 prev comp/remove.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/remove.c
 done remove.o generated
@@ -2511,7 +2510,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/rename.c
-meta rename.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/rename.c rename
+meta rename.o %.c>%.o comp/rename.c rename
 prev comp/rename.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/rename.c
 done rename.o generated
@@ -2520,7 +2519,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/link.c
-meta link.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/link.c link
+meta link.o %.c>%.o comp/link.c link
 prev comp/link.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/link.c
 done link.o generated
@@ -2528,7 +2527,7 @@
 make comp/unlink.c
 prev include/ast.h implicit
 done comp/unlink.c
-meta unlink.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/unlink.c unlink
+meta unlink.o %.c>%.o comp/unlink.c unlink
 prev comp/unlink.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/unlink.c
 done unlink.o generated
@@ -2536,7 +2535,7 @@
 make string/strdup.c
 prev include/ast.h implicit
 done string/strdup.c
-meta strdup.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strdup.c strdup
+meta strdup.o %.c>%.o string/strdup.c strdup
 prev string/strdup.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strdup.c
 done strdup.o generated
@@ -2544,7 +2543,7 @@
 make comp/strchr.c
 prev include/ast.h implicit
 done comp/strchr.c
-meta strchr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strchr.c strchr
+meta strchr.o %.c>%.o comp/strchr.c strchr
 prev comp/strchr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/strchr.c
 done strchr.o generated
@@ -2552,7 +2551,7 @@
 make comp/strrchr.c
 prev include/ast.h implicit
 done comp/strrchr.c
-meta strrchr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strrchr.c strrchr
+meta strrchr.o %.c>%.o comp/strrchr.c strrchr
 prev comp/strrchr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/strrchr.c
 done strrchr.o generated
@@ -2560,7 +2559,7 @@
 make comp/strstr.c
 prev include/ast.h implicit
 done comp/strstr.c
-meta strstr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strstr.c strstr
+meta strstr.o %.c>%.o comp/strstr.c strstr
 prev comp/strstr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/strstr.c
 done strstr.o generated
@@ -2572,7 +2571,7 @@
 done sfio/sfstrtof.h
 prev include/ast.h implicit
 done comp/strtod.c
-meta strtod.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strtod.c strtod
+meta strtod.o %.c>%.o comp/strtod.c strtod
 prev comp/strtod.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c comp/strtod.c
 done strtod.o generated
@@ -2580,7 +2579,7 @@
 make comp/strtold.c
 prev sfio/sfstrtof.h implicit
 done comp/strtold.c
-meta strtold.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strtold.c strtold
+meta strtold.o %.c>%.o comp/strtold.c strtold
 prev comp/strtold.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c comp/strtold.c
 done strtold.o generated
@@ -2591,7 +2590,7 @@
 prev include/ast.h implicit
 done string/strtoi.h dontcare
 done comp/strtol.c
-meta strtol.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strtol.c strtol
+meta strtol.o %.c>%.o comp/strtol.c strtol
 prev comp/strtol.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c comp/strtol.c
 done strtol.o generated
@@ -2599,7 +2598,7 @@
 make comp/strtoll.c
 prev string/strtoi.h implicit
 done comp/strtoll.c
-meta strtoll.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strtoll.c strtoll
+meta strtoll.o %.c>%.o comp/strtoll.c strtoll
 prev comp/strtoll.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c comp/strtoll.c
 done strtoll.o generated
@@ -2607,7 +2606,7 @@
 make comp/strtoul.c
 prev string/strtoi.h implicit
 done comp/strtoul.c
-meta strtoul.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strtoul.c strtoul
+meta strtoul.o %.c>%.o comp/strtoul.c strtoul
 prev comp/strtoul.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c comp/strtoul.c
 done strtoul.o generated
@@ -2615,7 +2614,7 @@
 make comp/strtoull.c
 prev string/strtoi.h implicit
 done comp/strtoull.c
-meta strtoull.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strtoull.c strtoull
+meta strtoull.o %.c>%.o comp/strtoull.c strtoull
 prev comp/strtoull.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c comp/strtoull.c
 done strtoull.o generated
@@ -2623,7 +2622,7 @@
 make string/strton.c
 prev string/strtoi.h implicit
 done string/strton.c
-meta strton.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strton.c strton
+meta strton.o %.c>%.o string/strton.c strton
 prev string/strton.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c string/strton.c
 done strton.o generated
@@ -2631,7 +2630,7 @@
 make string/strtonll.c
 prev string/strtoi.h implicit
 done string/strtonll.c
-meta strtonll.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strtonll.c 
strtonll
+meta strtonll.o %.c>%.o string/strtonll.c strtonll
 prev string/strtonll.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c string/strtonll.c
 done strtonll.o generated
@@ -2640,7 +2639,7 @@
 prev sfio/sfstrtof.h implicit
 prev include/ast.h implicit
 done string/strntod.c
-meta strntod.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strntod.c strntod
+meta strntod.o %.c>%.o string/strntod.c strntod
 prev string/strntod.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c string/strntod.c
 done strntod.o generated
@@ -2649,7 +2648,7 @@
 prev sfio/sfstrtof.h implicit
 prev include/ast.h implicit
 done string/strntold.c
-meta strntold.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strntold.c 
strntold
+meta strntold.o %.c>%.o string/strntold.c strntold
 prev string/strntold.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c string/strntold.c
 done strntold.o generated
@@ -2657,7 +2656,7 @@
 make string/strntol.c
 prev string/strtoi.h implicit
 done string/strntol.c
-meta strntol.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strntol.c strntol
+meta strntol.o %.c>%.o string/strntol.c strntol
 prev string/strntol.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c string/strntol.c
 done strntol.o generated
@@ -2665,7 +2664,7 @@
 make string/strntoll.c
 prev string/strtoi.h implicit
 done string/strntoll.c
-meta strntoll.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strntoll.c 
strntoll
+meta strntoll.o %.c>%.o string/strntoll.c strntoll
 prev string/strntoll.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c string/strntoll.c
 done strntoll.o generated
@@ -2673,7 +2672,7 @@
 make string/strntoul.c
 prev string/strtoi.h implicit
 done string/strntoul.c
-meta strntoul.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strntoul.c 
strntoul
+meta strntoul.o %.c>%.o string/strntoul.c strntoul
 prev string/strntoul.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c string/strntoul.c
 done strntoul.o generated
@@ -2681,7 +2680,7 @@
 make string/strntoull.c
 prev string/strtoi.h implicit
 done string/strntoull.c
-meta strntoull.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strntoull.c 
strntoull
+meta strntoull.o %.c>%.o string/strntoull.c strntoull
 prev string/strntoull.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istring 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c string/strntoull.c
 done strntoull.o generated
@@ -2689,7 +2688,7 @@
 make comp/strcasecmp.c
 prev include/ast.h implicit
 done comp/strcasecmp.c
-meta strcasecmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strcasecmp.c 
strcasecmp
+meta strcasecmp.o %.c>%.o comp/strcasecmp.c strcasecmp
 prev comp/strcasecmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/strcasecmp.c
 done strcasecmp.o generated
@@ -2697,14 +2696,14 @@
 make comp/strncasecmp.c
 prev include/ast.h implicit
 done comp/strncasecmp.c
-meta strncasecmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strncasecmp.c 
strncasecmp
+meta strncasecmp.o %.c>%.o comp/strncasecmp.c strncasecmp
 prev comp/strncasecmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/strncasecmp.c
 done strncasecmp.o generated
 make strerror.o
 make string/strerror.c
 make FEATURE/errno implicit
-meta FEATURE/errno features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/errno errno
+meta FEATURE/errno features/%>FEATURE/% features/errno errno
 make features/errno
 done features/errno
 prev ast.req
@@ -2713,7 +2712,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done string/strerror.c
-meta strerror.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/strerror.c 
strerror
+meta strerror.o %.c>%.o string/strerror.c strerror
 prev string/strerror.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c string/strerror.c
 done strerror.o generated
@@ -2723,7 +2722,7 @@
 prev std/stdio.h implicit
 prev include/ast.h implicit
 done comp/mktemp.c
-meta mktemp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/mktemp.c mktemp
+meta mktemp.o %.c>%.o comp/mktemp.c mktemp
 prev comp/mktemp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/mktemp.c
 done mktemp.o generated
@@ -2733,7 +2732,7 @@
 prev std/stdio.h implicit
 prev include/ast.h implicit
 done comp/tmpnam.c
-meta tmpnam.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/tmpnam.c tmpnam
+meta tmpnam.o %.c>%.o comp/tmpnam.c tmpnam
 prev comp/tmpnam.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/tmpnam.c
 done tmpnam.o generated
@@ -2742,7 +2741,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/fsync.c
-meta fsync.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/fsync.c fsync
+meta fsync.o %.c>%.o comp/fsync.c fsync
 prev comp/fsync.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/fsync.c
 done fsync.o generated
@@ -2751,7 +2750,7 @@
 prev include/ast.h implicit
 prev ast_lib.h implicit
 done comp/execlp.c
-meta execlp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/execlp.c execlp
+meta execlp.o %.c>%.o comp/execlp.c execlp
 prev comp/execlp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/execlp.c
 done execlp.o generated
@@ -2762,7 +2761,7 @@
 prev sig.h implicit
 prev include/ast.h implicit
 done comp/execve.c
-meta execve.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/execve.c execve
+meta execve.o %.c>%.o comp/execve.c execve
 prev comp/execve.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/execve.c
 done execve.o generated
@@ -2771,7 +2770,7 @@
 prev include/ast.h implicit
 prev ast_lib.h implicit
 done comp/execvp.c
-meta execvp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/execvp.c execvp
+meta execvp.o %.c>%.o comp/execvp.c execvp
 prev comp/execvp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/execvp.c
 done execvp.o generated
@@ -2780,7 +2779,7 @@
 prev include/ast.h implicit
 prev ast_lib.h implicit
 done comp/execvpe.c
-meta execvpe.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/execvpe.c execvpe
+meta execvpe.o %.c>%.o comp/execvpe.c execvpe
 prev comp/execvpe.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/execvpe.c
 done execvpe.o generated
@@ -2788,7 +2787,7 @@
 make comp/spawnveg.c
 make ast_vfork.h implicit
 make FEATURE/vfork
-meta FEATURE/vfork features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/vfork vfork
+meta FEATURE/vfork features/%>FEATURE/% features/vfork vfork
 make features/vfork
 done features/vfork
 prev ast.req
@@ -2804,7 +2803,7 @@
 done spawn.h dontcare virtual
 prev include/ast.h implicit
 done comp/spawnveg.c
-meta spawnveg.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/spawnveg.c spawnveg
+meta spawnveg.o %.c>%.o comp/spawnveg.c spawnveg
 prev comp/spawnveg.c
 exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} 
-D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iinclude -Istd -D_PACKAGE_ast -c 
comp/spawnveg.c
 done spawnveg.o generated
@@ -2813,7 +2812,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/vfork.c
-meta vfork.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/vfork.c vfork
+meta vfork.o %.c>%.o comp/vfork.c vfork
 prev comp/vfork.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/vfork.c
 done vfork.o generated
@@ -2822,7 +2821,7 @@
 prev sig.h implicit
 prev include/ast.h implicit
 done comp/killpg.c
-meta killpg.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/killpg.c killpg
+meta killpg.o %.c>%.o comp/killpg.c killpg
 prev comp/killpg.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/killpg.c
 done killpg.o generated
@@ -2834,7 +2833,7 @@
 done cdt/dthdr.h dontcare
 prev include/ast.h implicit
 done comp/hsearch.c
-meta hsearch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/hsearch.c hsearch
+meta hsearch.o %.c>%.o comp/hsearch.c hsearch
 prev comp/hsearch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/hsearch.c
 done hsearch.o generated
@@ -2843,7 +2842,7 @@
 prev cdt/dthdr.h implicit
 prev include/ast.h implicit
 done comp/tsearch.c
-meta tsearch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/tsearch.c tsearch
+meta tsearch.o %.c>%.o comp/tsearch.c tsearch
 prev comp/tsearch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/tsearch.c
 done tsearch.o generated
@@ -2851,7 +2850,7 @@
 make comp/getlogin.c
 prev include/ast.h implicit
 done comp/getlogin.c
-meta getlogin.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/getlogin.c getlogin
+meta getlogin.o %.c>%.o comp/getlogin.c getlogin
 prev comp/getlogin.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/getlogin.c
 done getlogin.o generated
@@ -2859,7 +2858,7 @@
 make comp/putenv.c
 prev include/ast.h implicit
 done comp/putenv.c
-meta putenv.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/putenv.c putenv
+meta putenv.o %.c>%.o comp/putenv.c putenv
 prev comp/putenv.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/putenv.c
 done putenv.o generated
@@ -2868,7 +2867,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/lstat.c
-meta lstat.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/lstat.c lstat
+meta lstat.o %.c>%.o comp/lstat.c lstat
 prev comp/lstat.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/lstat.c
 done lstat.o generated
@@ -2878,14 +2877,14 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/statvfs.c
-meta statvfs.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/statvfs.c statvfs
+meta statvfs.o %.c>%.o comp/statvfs.c statvfs
 prev comp/statvfs.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/statvfs.c
 done statvfs.o generated
 make eaccess.o
 make comp/eaccess.c
 make FEATURE/eaccess implicit
-meta FEATURE/eaccess features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/eaccess eaccess
+meta FEATURE/eaccess features/%>FEATURE/% features/eaccess eaccess
 make features/eaccess
 done features/eaccess
 prev ast.req
@@ -2894,7 +2893,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/eaccess.c
-meta eaccess.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/eaccess.c eaccess
+meta eaccess.o %.c>%.o comp/eaccess.c eaccess
 prev comp/eaccess.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/eaccess.c
 done eaccess.o generated
@@ -2903,7 +2902,7 @@
 make comp/gross_sgi.h implicit
 done comp/gross_sgi.h dontcare
 make FEATURE/hack implicit
-meta FEATURE/hack features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/hack hack
+meta FEATURE/hack features/%>FEATURE/% features/hack hack
 make features/hack
 done features/hack
 prev ast.req
@@ -2912,7 +2911,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/gross.c
-meta gross.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/gross.c gross
+meta gross.o %.c>%.o comp/gross.c gross
 prev comp/gross.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/gross.c
 done gross.o generated
@@ -2922,7 +2921,7 @@
 prev include/ast_windows.h implicit
 prev include/ls.h implicit
 make FEATURE/omitted implicit
-meta FEATURE/omitted features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/omitted omitted
+meta FEATURE/omitted features/%>FEATURE/% features/omitted omitted
 make features/omitted
 done features/omitted
 prev ast.req
@@ -2932,7 +2931,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/omitted.c
-meta omitted.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/omitted.c omitted
+meta omitted.o %.c>%.o comp/omitted.c omitted
 prev comp/omitted.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/omitted.c
 done omitted.o generated
@@ -2943,7 +2942,7 @@
 done comp/fakelink.h dontcare
 prev include/ast.h implicit
 done comp/readlink.c
-meta readlink.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/readlink.c readlink
+meta readlink.o %.c>%.o comp/readlink.c readlink
 prev comp/readlink.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/readlink.c
 done readlink.o generated
@@ -2953,7 +2952,7 @@
 prev comp/fakelink.h implicit
 prev include/ast.h implicit
 done comp/symlink.c
-meta symlink.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/symlink.c symlink
+meta symlink.o %.c>%.o comp/symlink.c symlink
 prev comp/symlink.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/symlink.c
 done symlink.o generated
@@ -2961,7 +2960,7 @@
 make comp/getpgrp.c
 prev ast_common.h implicit
 done comp/getpgrp.c
-meta getpgrp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/getpgrp.c getpgrp
+meta getpgrp.o %.c>%.o comp/getpgrp.c getpgrp
 prev comp/getpgrp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I.  -c comp/getpgrp.c
 done getpgrp.o generated
@@ -2970,7 +2969,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/setpgid.c
-meta setpgid.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/setpgid.c setpgid
+meta setpgid.o %.c>%.o comp/setpgid.c setpgid
 prev comp/setpgid.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/setpgid.c
 done setpgid.o generated
@@ -2980,7 +2979,7 @@
 prev ast_tty.h implicit
 prev include/ast.h implicit
 done comp/setsid.c
-meta setsid.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/setsid.c setsid
+meta setsid.o %.c>%.o comp/setsid.c setsid
 prev comp/setsid.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/setsid.c
 done setsid.o generated
@@ -2991,7 +2990,7 @@
 prev include/wait.h implicit
 prev include/ast.h implicit
 done comp/waitpid.c
-meta waitpid.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/waitpid.c waitpid
+meta waitpid.o %.c>%.o comp/waitpid.c waitpid
 prev comp/waitpid.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/waitpid.c
 done waitpid.o generated
@@ -3054,7 +3053,7 @@
 make comp/creat64.c
 prev include/ast.h implicit
 done comp/creat64.c
-meta creat64.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/creat64.c creat64
+meta creat64.o %.c>%.o comp/creat64.c creat64
 prev comp/creat64.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/creat64.c
 done creat64.o generated
@@ -3065,7 +3064,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/fcntl.c
-meta fcntl.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/fcntl.c fcntl
+meta fcntl.o %.c>%.o comp/fcntl.c fcntl
 prev comp/fcntl.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/fcntl.c
 done fcntl.o generated
@@ -3076,7 +3075,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done comp/open.c
-meta open.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/open.c open
+meta open.o %.c>%.o comp/open.c open
 prev comp/open.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/open.c
 done open.o generated
@@ -3084,7 +3083,7 @@
 make comp/atexit.c
 prev include/ast.h implicit
 done comp/atexit.c
-meta atexit.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/atexit.c atexit
+meta atexit.o %.c>%.o comp/atexit.c atexit
 prev comp/atexit.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/atexit.c
 done atexit.o generated
@@ -3092,7 +3091,7 @@
 make dir/getdents.c
 prev dir/dirlib.h implicit
 done dir/getdents.c
-meta getdents.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/dir/getdents.c getdents
+meta getdents.o %.c>%.o dir/getdents.c getdents
 prev dir/getdents.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c dir/getdents.c
 done getdents.o generated
@@ -3100,7 +3099,7 @@
 make comp/getwd.c
 prev include/ast.h implicit
 done comp/getwd.c
-meta getwd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/getwd.c getwd
+meta getwd.o %.c>%.o comp/getwd.c getwd
 prev comp/getwd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/getwd.c
 done getwd.o generated
@@ -3109,7 +3108,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/dup2.c
-meta dup2.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/dup2.c dup2
+meta dup2.o %.c>%.o comp/dup2.c dup2
 prev comp/dup2.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/dup2.c
 done dup2.o generated
@@ -3117,7 +3116,7 @@
 make comp/errno.c
 prev include/ast.h implicit
 done comp/errno.c
-meta errno.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/errno.c errno
+meta errno.o %.c>%.o comp/errno.c errno
 prev comp/errno.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/errno.c
 done errno.o generated
@@ -3130,7 +3129,7 @@
 prev preroot.h implicit
 prev include/ast.h implicit
 done preroot/getpreroot.c
-meta getpreroot.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/preroot/getpreroot.c 
getpreroot
+meta getpreroot.o %.c>%.o preroot/getpreroot.c getpreroot
 prev preroot/getpreroot.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c preroot/getpreroot.c
 done getpreroot.o generated
@@ -3140,7 +3139,7 @@
 prev preroot.h implicit
 prev include/ast.h implicit
 done preroot/ispreroot.c
-meta ispreroot.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/preroot/ispreroot.c 
ispreroot
+meta ispreroot.o %.c>%.o preroot/ispreroot.c ispreroot
 prev preroot/ispreroot.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c preroot/ispreroot.c
 done ispreroot.o generated
@@ -3149,7 +3148,7 @@
 prev preroot.h implicit
 prev include/ast.h implicit
 done preroot/realopen.c
-meta realopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/preroot/realopen.c 
realopen
+meta realopen.o %.c>%.o preroot/realopen.c realopen
 prev preroot/realopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c preroot/realopen.c
 done realopen.o generated
@@ -3159,7 +3158,7 @@
 prev preroot.h implicit
 prev include/ast.h implicit
 done preroot/setpreroot.c
-meta setpreroot.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/preroot/setpreroot.c 
setpreroot
+meta setpreroot.o %.c>%.o preroot/setpreroot.c setpreroot
 prev preroot/setpreroot.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c preroot/setpreroot.c
 done setpreroot.o generated
@@ -3168,7 +3167,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/getgroups.c
-meta getgroups.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/getgroups.c 
getgroups
+meta getgroups.o %.c>%.o comp/getgroups.c getgroups
 prev comp/getgroups.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/getgroups.c
 done getgroups.o generated
@@ -3177,7 +3176,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/mount.c
-meta mount.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/mount.c mount
+meta mount.o %.c>%.o comp/mount.c mount
 prev comp/mount.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/mount.c
 done mount.o generated
@@ -3187,7 +3186,7 @@
 prev include/proc.h implicit
 prev include/ast.h implicit
 done comp/system.c
-meta system.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/system.c system
+meta system.o %.c>%.o comp/system.c system
 prev comp/system.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/system.c
 done system.o generated
@@ -3197,7 +3196,7 @@
 prev ast_param.h implicit
 prev include/ast.h implicit
 done port/iblocks.c
-meta iblocks.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/iblocks.c iblocks
+meta iblocks.o %.c>%.o port/iblocks.c iblocks
 prev port/iblocks.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c port/iblocks.c
 done iblocks.o generated
@@ -3205,7 +3204,7 @@
 make string/modedata.c
 prev string/modelib.h implicit
 done string/modedata.c
-meta modedata.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/string/modedata.c 
modedata
+meta modedata.o %.c>%.o string/modedata.c modedata
 prev string/modedata.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Istring -Iinclude -Istd 
-D_PACKAGE_ast  -c string/modedata.c
 done modedata.o generated
@@ -3214,7 +3213,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done tm/tmdata.c
-meta tmdata.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/tm/tmdata.c tmdata
+meta tmdata.o %.c>%.o tm/tmdata.c tmdata
 prev tm/tmdata.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast  -c tm/tmdata.c
 done tmdata.o generated
@@ -3225,7 +3224,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done disc/memfatal.c
-meta memfatal.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/memfatal.c memfatal
+meta memfatal.o %.c>%.o disc/memfatal.c memfatal
 prev disc/memfatal.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c disc/memfatal.c
 done memfatal.o generated
@@ -3238,7 +3237,7 @@
 prev include/ccode.h implicit
 prev include/ast.h implicit
 done disc/sfkeyprintf.c
-meta sfkeyprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfkeyprintf.c 
sfkeyprintf
+meta sfkeyprintf.o %.c>%.o disc/sfkeyprintf.c sfkeyprintf
 prev disc/sfkeyprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c disc/sfkeyprintf.c
 done sfkeyprintf.o generated
@@ -3249,7 +3248,7 @@
 prev sfio/sfhdr.h implicit
 done disc/sfdchdr.h
 done disc/sfdcdio.c
-meta sfdcdio.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdcdio.c sfdcdio
+meta sfdcdio.o %.c>%.o disc/sfdcdio.c sfdcdio
 prev disc/sfdcdio.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdcdio.c
 done sfdcdio.o generated
@@ -3257,7 +3256,7 @@
 make disc/sfdcdos.c
 prev disc/sfdchdr.h implicit
 done disc/sfdcdos.c
-meta sfdcdos.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdcdos.c sfdcdos
+meta sfdcdos.o %.c>%.o disc/sfdcdos.c sfdcdos
 prev disc/sfdcdos.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdcdos.c
 done sfdcdos.o generated
@@ -3265,7 +3264,7 @@
 make disc/sfdcfilter.c
 prev disc/sfdchdr.h implicit
 done disc/sfdcfilter.c
-meta sfdcfilter.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdcfilter.c 
sfdcfilter
+meta sfdcfilter.o %.c>%.o disc/sfdcfilter.c sfdcfilter
 prev disc/sfdcfilter.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdcfilter.c
 done sfdcfilter.o generated
@@ -3273,7 +3272,7 @@
 make disc/sfdcseekable.c
 prev disc/sfdchdr.h implicit
 done disc/sfdcseekable.c
-meta sfdcseekable.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdcseekable.c 
sfdcseekable
+meta sfdcseekable.o %.c>%.o disc/sfdcseekable.c sfdcseekable
 prev disc/sfdcseekable.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdcseekable.c
 done sfdcseekable.o generated
@@ -3281,7 +3280,7 @@
 make disc/sfdcslow.c
 prev disc/sfdchdr.h implicit
 done disc/sfdcslow.c
-meta sfdcslow.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdcslow.c sfdcslow
+meta sfdcslow.o %.c>%.o disc/sfdcslow.c sfdcslow
 prev disc/sfdcslow.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdcslow.c
 done sfdcslow.o generated
@@ -3289,7 +3288,7 @@
 make disc/sfdcsubstr.c
 prev disc/sfdchdr.h implicit
 done disc/sfdcsubstr.c
-meta sfdcsubstr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdcsubstr.c 
sfdcsubstr
+meta sfdcsubstr.o %.c>%.o disc/sfdcsubstr.c sfdcsubstr
 prev disc/sfdcsubstr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdcsubstr.c
 done sfdcsubstr.o generated
@@ -3297,7 +3296,7 @@
 make disc/sfdctee.c
 prev disc/sfdchdr.h implicit
 done disc/sfdctee.c
-meta sfdctee.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdctee.c sfdctee
+meta sfdctee.o %.c>%.o disc/sfdctee.c sfdctee
 prev disc/sfdctee.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdctee.c
 done sfdctee.o generated
@@ -3305,7 +3304,7 @@
 make disc/sfdcunion.c
 prev disc/sfdchdr.h implicit
 done disc/sfdcunion.c
-meta sfdcunion.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdcunion.c 
sfdcunion
+meta sfdcunion.o %.c>%.o disc/sfdcunion.c sfdcunion
 prev disc/sfdcunion.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdcunion.c
 done sfdcunion.o generated
@@ -3314,7 +3313,7 @@
 prev ast_tty.h implicit
 prev disc/sfdchdr.h implicit
 done disc/sfdcmore.c
-meta sfdcmore.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdcmore.c sfdcmore
+meta sfdcmore.o %.c>%.o disc/sfdcmore.c sfdcmore
 prev disc/sfdcmore.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdcmore.c
 done sfdcmore.o generated
@@ -3322,7 +3321,7 @@
 make disc/sfdcprefix.c
 prev disc/sfdchdr.h implicit
 done disc/sfdcprefix.c
-meta sfdcprefix.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfdcprefix.c 
sfdcprefix
+meta sfdcprefix.o %.c>%.o disc/sfdcprefix.c sfdcprefix
 prev disc/sfdcprefix.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idisc -Iport -Isfio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c disc/sfdcprefix.c
 done sfdcprefix.o generated
@@ -3331,7 +3330,7 @@
 prev std/wchar.h implicit
 prev include/ast.h implicit
 done comp/wc.c
-meta wc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/wc.c wc
+meta wc.o %.c>%.o comp/wc.c wc
 prev comp/wc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/wc.c
 done wc.o generated
@@ -3341,7 +3340,7 @@
 done comp/libgen.h
 prev ast_map.h implicit
 done comp/basename.c
-meta basename.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/basename.c basename
+meta basename.o %.c>%.o comp/basename.c basename
 prev comp/basename.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp  -c comp/basename.c
 done basename.o generated
@@ -3354,7 +3353,7 @@
 done comp/sysloglib.h dontcare
 prev include/ast.h implicit
 done comp/closelog.c
-meta closelog.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/closelog.c closelog
+meta closelog.o %.c>%.o comp/closelog.c closelog
 prev comp/closelog.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/closelog.c
 done closelog.o generated
@@ -3363,7 +3362,7 @@
 prev comp/libgen.h implicit
 prev ast_map.h implicit
 done comp/dirname.c
-meta dirname.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/dirname.c dirname
+meta dirname.o %.c>%.o comp/dirname.c dirname
 prev comp/dirname.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp  -c comp/dirname.c
 done dirname.o generated
@@ -3373,7 +3372,7 @@
 done comp/fmtmsg.h dontcare
 prev include/ast.h implicit
 done comp/fmtmsglib.c
-meta fmtmsglib.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/fmtmsglib.c 
fmtmsglib
+meta fmtmsglib.o %.c>%.o comp/fmtmsglib.c fmtmsglib
 prev comp/fmtmsglib.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/fmtmsglib.c
 done fmtmsglib.o generated
@@ -3385,7 +3384,7 @@
 prev include/ast.h implicit
 prev ast_lib.h implicit
 done comp/fnmatch.c
-meta fnmatch.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/fnmatch.c fnmatch
+meta fnmatch.o %.c>%.o comp/fnmatch.c fnmatch
 prev comp/fnmatch.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/fnmatch.c
 done fnmatch.o generated
@@ -3396,7 +3395,7 @@
 done comp/ftw.h
 prev include/ast.h implicit
 done comp/ftw.c
-meta ftw.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/ftw.c ftw
+meta ftw.o %.c>%.o comp/ftw.c ftw
 prev comp/ftw.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/ftw.c
 done ftw.o generated
@@ -3406,7 +3405,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done comp/getdate.c
-meta getdate.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/getdate.c getdate
+meta getdate.o %.c>%.o comp/getdate.c getdate
 prev comp/getdate.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/getdate.c
 done getdate.o generated
@@ -3416,7 +3415,7 @@
 prev include/ast.h implicit
 prev ast_lib.h implicit
 done comp/getsubopt.c
-meta getsubopt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/getsubopt.c 
getsubopt
+meta getsubopt.o %.c>%.o comp/getsubopt.c getsubopt
 prev comp/getsubopt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/getsubopt.c
 done getsubopt.o generated
@@ -3433,7 +3432,7 @@
 prev include/ls.h implicit
 prev include/ast.h implicit
 done misc/glob.c
-meta glob.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/misc/glob.c glob
+meta glob.o %.c>%.o misc/glob.c glob
 prev misc/glob.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Idir -Iinclude -Istd 
-D_PACKAGE_ast -c misc/glob.c
 done glob.o generated
@@ -3442,7 +3441,7 @@
 prev comp/ftw.h implicit
 prev include/ast.h implicit
 done comp/nftw.c
-meta nftw.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/nftw.c nftw
+meta nftw.o %.c>%.o comp/nftw.c nftw
 prev comp/nftw.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/nftw.c
 done nftw.o generated
@@ -3451,7 +3450,7 @@
 prev comp/sysloglib.h implicit
 prev include/ast.h implicit
 done comp/openlog.c
-meta openlog.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/openlog.c openlog
+meta openlog.o %.c>%.o comp/openlog.c openlog
 prev comp/openlog.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/openlog.c
 done openlog.o generated
@@ -3461,7 +3460,7 @@
 prev comp/re_comp.h implicit
 prev include/ast.h implicit
 done comp/re_comp.c
-meta re_comp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/re_comp.c re_comp
+meta re_comp.o %.c>%.o comp/re_comp.c re_comp
 prev comp/re_comp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/re_comp.c
 done re_comp.o generated
@@ -3470,7 +3469,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/resolvepath.c
-meta resolvepath.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/resolvepath.c 
resolvepath
+meta resolvepath.o %.c>%.o comp/resolvepath.c resolvepath
 prev comp/resolvepath.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/resolvepath.c
 done resolvepath.o generated
@@ -3478,7 +3477,7 @@
 make comp/realpath.c
 prev include/ast.h implicit
 done comp/realpath.c
-meta realpath.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/realpath.c realpath
+meta realpath.o %.c>%.o comp/realpath.c realpath
 prev comp/realpath.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/realpath.c
 done realpath.o generated
@@ -3489,7 +3488,7 @@
 prev comp/libgen.h implicit
 prev include/ast.h implicit
 done comp/regcmp.c
-meta regcmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/regcmp.c regcmp
+meta regcmp.o %.c>%.o comp/regcmp.c regcmp
 prev comp/regcmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/regcmp.c
 done regcmp.o generated
@@ -3501,7 +3500,7 @@
 done comp/regexp.h
 prev include/ast.h implicit
 done comp/regexp.c
-meta regexp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/regexp.c regexp
+meta regexp.o %.c>%.o comp/regexp.c regexp
 prev comp/regexp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/regexp.c
 done regexp.o generated
@@ -3510,7 +3509,7 @@
 prev comp/sysloglib.h implicit
 prev include/ast.h implicit
 done comp/setlogmask.c
-meta setlogmask.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/setlogmask.c 
setlogmask
+meta setlogmask.o %.c>%.o comp/setlogmask.c setlogmask
 prev comp/setlogmask.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/setlogmask.c
 done setlogmask.o generated
@@ -3520,7 +3519,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done comp/strftime.c
-meta strftime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strftime.c strftime
+meta strftime.o %.c>%.o comp/strftime.c strftime
 prev comp/strftime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/strftime.c
 done strftime.o generated
@@ -3530,7 +3529,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done comp/strptime.c
-meta strptime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/strptime.c strptime
+meta strptime.o %.c>%.o comp/strptime.c strptime
 prev comp/strptime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/strptime.c
 done strptime.o generated
@@ -3539,7 +3538,7 @@
 prev include/swap.h implicit
 prev include/ast.h implicit
 done comp/swab.c
-meta swab.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/swab.c swab
+meta swab.o %.c>%.o comp/swab.c swab
 prev comp/swab.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/swab.c
 done swab.o generated
@@ -3552,7 +3551,7 @@
 prev comp/sysloglib.h implicit
 prev include/ast.h implicit
 done comp/syslog.c
-meta syslog.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/syslog.c syslog
+meta syslog.o %.c>%.o comp/syslog.c syslog
 prev comp/syslog.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/syslog.c
 done syslog.o generated
@@ -3562,7 +3561,7 @@
 prev include/ast.h implicit
 prev include/ast_std.h implicit
 done comp/tempnam.c
-meta tempnam.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/tempnam.c tempnam
+meta tempnam.o %.c>%.o comp/tempnam.c tempnam
 prev comp/tempnam.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/tempnam.c
 done tempnam.o generated
@@ -3574,7 +3573,7 @@
 done comp/wordexp.h
 prev include/ast.h implicit
 done comp/wordexp.c
-meta wordexp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/wordexp.c wordexp
+meta wordexp.o %.c>%.o comp/wordexp.c wordexp
 prev comp/wordexp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/wordexp.c
 done wordexp.o generated
@@ -3584,7 +3583,7 @@
 prev include/tm.h implicit
 prev include/ast.h implicit
 done comp/mktime.c
-meta mktime.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/mktime.c mktime
+meta mktime.o %.c>%.o comp/mktime.c mktime
 prev comp/mktime.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/mktime.c
 done mktime.o generated
@@ -3599,7 +3598,7 @@
 prev include/ast.h implicit
 done regex/reglib.h
 done regex/regalloc.c
-meta regalloc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regalloc.c regalloc
+meta regalloc.o %.c>%.o regex/regalloc.c regalloc
 prev regex/regalloc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regalloc.c
 done regalloc.o generated
@@ -3607,7 +3606,7 @@
 make regex/regclass.c
 prev regex/reglib.h implicit
 done regex/regclass.c
-meta regclass.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regclass.c regclass
+meta regclass.o %.c>%.o regex/regclass.c regclass
 prev regex/regclass.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regclass.c
 done regclass.o generated
@@ -3619,7 +3618,7 @@
 prev include/ccode.h implicit
 prev regex/reglib.h implicit
 done regex/regcoll.c
-meta regcoll.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regcoll.c regcoll
+meta regcoll.o %.c>%.o regex/regcoll.c regcoll
 prev regex/regcoll.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regcoll.c
 done regcoll.o generated
@@ -3628,7 +3627,7 @@
 prev port/lclib.h implicit
 prev regex/reglib.h implicit
 done regex/regcomp.c
-meta regcomp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regcomp.c regcomp
+meta regcomp.o %.c>%.o regex/regcomp.c regcomp
 prev regex/regcomp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Iregex -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c regex/regcomp.c
 done regcomp.o generated
@@ -3637,7 +3636,7 @@
 prev include/regex.h implicit
 prev include/ast.h implicit
 done regex/regcache.c
-meta regcache.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regcache.c regcache
+meta regcache.o %.c>%.o regex/regcache.c regcache
 prev regex/regcache.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regcache.c
 done regcache.o generated
@@ -3645,7 +3644,7 @@
 make regex/regerror.c
 prev regex/reglib.h implicit
 done regex/regerror.c
-meta regerror.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regerror.c regerror
+meta regerror.o %.c>%.o regex/regerror.c regerror
 prev regex/regerror.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regerror.c
 done regerror.o generated
@@ -3653,7 +3652,7 @@
 make regex/regexec.c
 prev regex/reglib.h implicit
 done regex/regexec.c
-meta regexec.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regexec.c regexec
+meta regexec.o %.c>%.o regex/regexec.c regexec
 prev regex/regexec.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regexec.c
 done regexec.o generated
@@ -3662,7 +3661,7 @@
 prev include/error.h implicit
 prev regex/reglib.h implicit
 done regex/regfatal.c
-meta regfatal.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regfatal.c regfatal
+meta regfatal.o %.c>%.o regex/regfatal.c regfatal
 prev regex/regfatal.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regfatal.c
 done regfatal.o generated
@@ -3671,7 +3670,7 @@
 prev include/ccode.h implicit
 prev regex/reglib.h implicit
 done regex/reginit.c
-meta reginit.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/reginit.c reginit
+meta reginit.o %.c>%.o regex/reginit.c reginit
 prev regex/reginit.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/reginit.c
 done reginit.o generated
@@ -3679,7 +3678,7 @@
 make regex/regnexec.c
 prev regex/reglib.h implicit
 done regex/regnexec.c
-meta regnexec.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regnexec.c regnexec
+meta regnexec.o %.c>%.o regex/regnexec.c regnexec
 prev regex/regnexec.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regnexec.c
 done regnexec.o generated
@@ -3687,7 +3686,7 @@
 make regex/regsubcomp.c
 prev regex/reglib.h implicit
 done regex/regsubcomp.c
-meta regsubcomp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regsubcomp.c 
regsubcomp
+meta regsubcomp.o %.c>%.o regex/regsubcomp.c regsubcomp
 prev regex/regsubcomp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regsubcomp.c
 done regsubcomp.o generated
@@ -3695,7 +3694,7 @@
 make regex/regsubexec.c
 prev regex/reglib.h implicit
 done regex/regsubexec.c
-meta regsubexec.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regsubexec.c 
regsubexec
+meta regsubexec.o %.c>%.o regex/regsubexec.c regsubexec
 prev regex/regsubexec.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regsubexec.c
 done regsubexec.o generated
@@ -3703,7 +3702,7 @@
 make regex/regsub.c
 prev regex/reglib.h implicit
 done regex/regsub.c
-meta regsub.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regsub.c regsub
+meta regsub.o %.c>%.o regex/regsub.c regsub
 prev regex/regsub.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regsub.c
 done regsub.o generated
@@ -3711,7 +3710,7 @@
 make regex/regrecord.c
 prev regex/reglib.h implicit
 done regex/regrecord.c
-meta regrecord.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regrecord.c 
regrecord
+meta regrecord.o %.c>%.o regex/regrecord.c regrecord
 prev regex/regrecord.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regrecord.c
 done regrecord.o generated
@@ -3719,7 +3718,7 @@
 make regex/regrexec.c
 prev regex/reglib.h implicit
 done regex/regrexec.c
-meta regrexec.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regrexec.c regrexec
+meta regrexec.o %.c>%.o regex/regrexec.c regrexec
 prev regex/regrexec.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regrexec.c
 done regrexec.o generated
@@ -3727,7 +3726,7 @@
 make regex/regstat.c
 prev regex/reglib.h implicit
 done regex/regstat.c
-meta regstat.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/regex/regstat.c regstat
+meta regstat.o %.c>%.o regex/regstat.c regstat
 prev regex/regstat.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iregex -Iinclude -Istd 
-D_PACKAGE_ast -c regex/regstat.c
 done regstat.o generated
@@ -3735,7 +3734,7 @@
 make cdt/dtclose.c
 prev cdt/dthdr.h implicit
 done cdt/dtclose.c
-meta dtclose.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtclose.c dtclose
+meta dtclose.o %.c>%.o cdt/dtclose.c dtclose
 prev cdt/dtclose.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtclose.c
 done dtclose.o generated
@@ -3743,7 +3742,7 @@
 make cdt/dtdisc.c
 prev cdt/dthdr.h implicit
 done cdt/dtdisc.c
-meta dtdisc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtdisc.c dtdisc
+meta dtdisc.o %.c>%.o cdt/dtdisc.c dtdisc
 prev cdt/dtdisc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtdisc.c
 done dtdisc.o generated
@@ -3751,7 +3750,7 @@
 make cdt/dtextract.c
 prev cdt/dthdr.h implicit
 done cdt/dtextract.c
-meta dtextract.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtextract.c 
dtextract
+meta dtextract.o %.c>%.o cdt/dtextract.c dtextract
 prev cdt/dtextract.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtextract.c
 done dtextract.o generated
@@ -3759,7 +3758,7 @@
 make cdt/dtflatten.c
 prev cdt/dthdr.h implicit
 done cdt/dtflatten.c
-meta dtflatten.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtflatten.c 
dtflatten
+meta dtflatten.o %.c>%.o cdt/dtflatten.c dtflatten
 prev cdt/dtflatten.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtflatten.c
 done dtflatten.o generated
@@ -3767,7 +3766,7 @@
 make cdt/dthash.c
 prev cdt/dthdr.h implicit
 done cdt/dthash.c
-meta dthash.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dthash.c dthash
+meta dthash.o %.c>%.o cdt/dthash.c dthash
 prev cdt/dthash.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dthash.c
 done dthash.o generated
@@ -3775,7 +3774,7 @@
 make cdt/dtlist.c
 prev cdt/dthdr.h implicit
 done cdt/dtlist.c
-meta dtlist.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtlist.c dtlist
+meta dtlist.o %.c>%.o cdt/dtlist.c dtlist
 prev cdt/dtlist.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtlist.c
 done dtlist.o generated
@@ -3783,7 +3782,7 @@
 make cdt/dtmethod.c
 prev cdt/dthdr.h implicit
 done cdt/dtmethod.c
-meta dtmethod.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtmethod.c dtmethod
+meta dtmethod.o %.c>%.o cdt/dtmethod.c dtmethod
 prev cdt/dtmethod.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtmethod.c
 done dtmethod.o generated
@@ -3791,7 +3790,7 @@
 make cdt/dtnew.c
 prev include/dt.h implicit
 done cdt/dtnew.c
-meta dtnew.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtnew.c dtnew
+meta dtnew.o %.c>%.o cdt/dtnew.c dtnew
 prev cdt/dtnew.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtnew.c
 done dtnew.o generated
@@ -3799,7 +3798,7 @@
 make cdt/dtopen.c
 prev cdt/dthdr.h implicit
 done cdt/dtopen.c
-meta dtopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtopen.c dtopen
+meta dtopen.o %.c>%.o cdt/dtopen.c dtopen
 prev cdt/dtopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtopen.c
 done dtopen.o generated
@@ -3807,7 +3806,7 @@
 make cdt/dtrenew.c
 prev cdt/dthdr.h implicit
 done cdt/dtrenew.c
-meta dtrenew.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtrenew.c dtrenew
+meta dtrenew.o %.c>%.o cdt/dtrenew.c dtrenew
 prev cdt/dtrenew.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtrenew.c
 done dtrenew.o generated
@@ -3815,7 +3814,7 @@
 make cdt/dtrestore.c
 prev cdt/dthdr.h implicit
 done cdt/dtrestore.c
-meta dtrestore.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtrestore.c 
dtrestore
+meta dtrestore.o %.c>%.o cdt/dtrestore.c dtrestore
 prev cdt/dtrestore.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtrestore.c
 done dtrestore.o generated
@@ -3823,7 +3822,7 @@
 make cdt/dtsize.c
 prev cdt/dthdr.h implicit
 done cdt/dtsize.c
-meta dtsize.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtsize.c dtsize
+meta dtsize.o %.c>%.o cdt/dtsize.c dtsize
 prev cdt/dtsize.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtsize.c
 done dtsize.o generated
@@ -3831,7 +3830,7 @@
 make cdt/dtstat.c
 prev cdt/dthdr.h implicit
 done cdt/dtstat.c
-meta dtstat.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtstat.c dtstat
+meta dtstat.o %.c>%.o cdt/dtstat.c dtstat
 prev cdt/dtstat.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtstat.c
 done dtstat.o generated
@@ -3839,7 +3838,7 @@
 make cdt/dtstrhash.c
 prev cdt/dthdr.h implicit
 done cdt/dtstrhash.c
-meta dtstrhash.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtstrhash.c 
dtstrhash
+meta dtstrhash.o %.c>%.o cdt/dtstrhash.c dtstrhash
 prev cdt/dtstrhash.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtstrhash.c
 done dtstrhash.o generated
@@ -3847,7 +3846,7 @@
 make cdt/dttree.c
 prev cdt/dthdr.h implicit
 done cdt/dttree.c
-meta dttree.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dttree.c dttree
+meta dttree.o %.c>%.o cdt/dttree.c dttree
 prev cdt/dttree.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dttree.c
 done dttree.o generated
@@ -3855,7 +3854,7 @@
 make cdt/dttreeset.c
 prev cdt/dthdr.h implicit
 done cdt/dttreeset.c
-meta dttreeset.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dttreeset.c 
dttreeset
+meta dttreeset.o %.c>%.o cdt/dttreeset.c dttreeset
 prev cdt/dttreeset.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dttreeset.c
 done dttreeset.o generated
@@ -3863,7 +3862,7 @@
 make cdt/dtview.c
 prev cdt/dthdr.h implicit
 done cdt/dtview.c
-meta dtview.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtview.c dtview
+meta dtview.o %.c>%.o cdt/dtview.c dtview
 prev cdt/dtview.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtview.c
 done dtview.o generated
@@ -3871,7 +3870,7 @@
 make cdt/dtwalk.c
 prev cdt/dthdr.h implicit
 done cdt/dtwalk.c
-meta dtwalk.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/cdt/dtwalk.c dtwalk
+meta dtwalk.o %.c>%.o cdt/dtwalk.c dtwalk
 prev cdt/dtwalk.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icdt -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c cdt/dtwalk.c
 done dtwalk.o generated
@@ -3879,7 +3878,7 @@
 make sfio/sfclose.c
 prev sfio/sfhdr.h implicit
 done sfio/sfclose.c
-meta sfclose.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfclose.c sfclose
+meta sfclose.o %.c>%.o sfio/sfclose.c sfclose
 prev sfio/sfclose.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfclose.c
 done sfclose.o generated
@@ -3887,7 +3886,7 @@
 make sfio/sfclrlock.c
 prev sfio/sfhdr.h implicit
 done sfio/sfclrlock.c
-meta sfclrlock.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfclrlock.c 
sfclrlock
+meta sfclrlock.o %.c>%.o sfio/sfclrlock.c sfclrlock
 prev sfio/sfclrlock.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfclrlock.c
 done sfclrlock.o generated
@@ -3895,7 +3894,7 @@
 make sfio/sfdisc.c
 prev sfio/sfhdr.h implicit
 done sfio/sfdisc.c
-meta sfdisc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfdisc.c sfdisc
+meta sfdisc.o %.c>%.o sfio/sfdisc.c sfdisc
 prev sfio/sfdisc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfdisc.c
 done sfdisc.o generated
@@ -3903,7 +3902,7 @@
 make sfio/sfdlen.c
 prev sfio/sfhdr.h implicit
 done sfio/sfdlen.c
-meta sfdlen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfdlen.c sfdlen
+meta sfdlen.o %.c>%.o sfio/sfdlen.c sfdlen
 prev sfio/sfdlen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfdlen.c
 done sfdlen.o generated
@@ -3911,7 +3910,7 @@
 make sfio/sfexcept.c
 prev sfio/sfhdr.h implicit
 done sfio/sfexcept.c
-meta sfexcept.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfexcept.c sfexcept
+meta sfexcept.o %.c>%.o sfio/sfexcept.c sfexcept
 prev sfio/sfexcept.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfexcept.c
 done sfexcept.o generated
@@ -3919,7 +3918,7 @@
 make sfio/sfgetl.c
 prev sfio/sfhdr.h implicit
 done sfio/sfgetl.c
-meta sfgetl.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfgetl.c sfgetl
+meta sfgetl.o %.c>%.o sfio/sfgetl.c sfgetl
 prev sfio/sfgetl.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfgetl.c
 done sfgetl.o generated
@@ -3927,7 +3926,7 @@
 make sfio/sfgetu.c
 prev sfio/sfhdr.h implicit
 done sfio/sfgetu.c
-meta sfgetu.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfgetu.c sfgetu
+meta sfgetu.o %.c>%.o sfio/sfgetu.c sfgetu
 prev sfio/sfgetu.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfgetu.c
 done sfgetu.o generated
@@ -3935,7 +3934,7 @@
 make sfio/sfcvt.c
 prev sfio/sfhdr.h implicit
 done sfio/sfcvt.c
-meta sfcvt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfcvt.c sfcvt
+meta sfcvt.o %.c>%.o sfio/sfcvt.c sfcvt
 prev sfio/sfcvt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfcvt.c
 done sfcvt.o generated
@@ -3943,7 +3942,7 @@
 make sfio/sfecvt.c
 prev sfio/sfhdr.h implicit
 done sfio/sfecvt.c
-meta sfecvt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfecvt.c sfecvt
+meta sfecvt.o %.c>%.o sfio/sfecvt.c sfecvt
 prev sfio/sfecvt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfecvt.c
 done sfecvt.o generated
@@ -3951,7 +3950,7 @@
 make sfio/sffcvt.c
 prev sfio/sfhdr.h implicit
 done sfio/sffcvt.c
-meta sffcvt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sffcvt.c sffcvt
+meta sffcvt.o %.c>%.o sfio/sffcvt.c sffcvt
 prev sfio/sffcvt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sffcvt.c
 done sffcvt.o generated
@@ -3959,7 +3958,7 @@
 make sfio/sfextern.c
 prev sfio/sfhdr.h implicit
 done sfio/sfextern.c
-meta sfextern.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfextern.c sfextern
+meta sfextern.o %.c>%.o sfio/sfextern.c sfextern
 prev sfio/sfextern.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfextern.c
 done sfextern.o generated
@@ -3967,7 +3966,7 @@
 make sfio/sffilbuf.c
 prev sfio/sfhdr.h implicit
 done sfio/sffilbuf.c
-meta sffilbuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sffilbuf.c sffilbuf
+meta sffilbuf.o %.c>%.o sfio/sffilbuf.c sffilbuf
 prev sfio/sffilbuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sffilbuf.c
 done sffilbuf.o generated
@@ -3975,7 +3974,7 @@
 make sfio/sfflsbuf.c
 prev sfio/sfhdr.h implicit
 done sfio/sfflsbuf.c
-meta sfflsbuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfflsbuf.c sfflsbuf
+meta sfflsbuf.o %.c>%.o sfio/sfflsbuf.c sfflsbuf
 prev sfio/sfflsbuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfflsbuf.c
 done sfflsbuf.o generated
@@ -3983,7 +3982,7 @@
 make sfio/sfprints.c
 prev sfio/sfhdr.h implicit
 done sfio/sfprints.c
-meta sfprints.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfprints.c sfprints
+meta sfprints.o %.c>%.o sfio/sfprints.c sfprints
 prev sfio/sfprints.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfprints.c
 done sfprints.o generated
@@ -3991,7 +3990,7 @@
 make sfio/sfgetd.c
 prev sfio/sfhdr.h implicit
 done sfio/sfgetd.c
-meta sfgetd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfgetd.c sfgetd
+meta sfgetd.o %.c>%.o sfio/sfgetd.c sfgetd
 prev sfio/sfgetd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfgetd.c
 done sfgetd.o generated
@@ -3999,7 +3998,7 @@
 make sfio/sfgetr.c
 prev sfio/sfhdr.h implicit
 done sfio/sfgetr.c
-meta sfgetr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfgetr.c sfgetr
+meta sfgetr.o %.c>%.o sfio/sfgetr.c sfgetr
 prev sfio/sfgetr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfgetr.c
 done sfgetr.o generated
@@ -4007,7 +4006,7 @@
 make sfio/sfieee.c
 prev sfio/sfhdr.h implicit
 done sfio/sfieee.c
-meta sfieee.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfieee.c sfieee
+meta sfieee.o %.c>%.o sfio/sfieee.c sfieee
 prev sfio/sfieee.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfieee.c
 done sfieee.o generated
@@ -4015,7 +4014,7 @@
 make sfio/sfllen.c
 prev sfio/sfhdr.h implicit
 done sfio/sfllen.c
-meta sfllen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfllen.c sfllen
+meta sfllen.o %.c>%.o sfio/sfllen.c sfllen
 prev sfio/sfllen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfllen.c
 done sfllen.o generated
@@ -4025,7 +4024,7 @@
 prev sig.h implicit
 prev sfio/sfhdr.h implicit
 done sfio/sfmode.c
-meta sfmode.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfmode.c sfmode
+meta sfmode.o %.c>%.o sfio/sfmode.c sfmode
 prev sfio/sfmode.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfmode.c
 done sfmode.o generated
@@ -4033,7 +4032,7 @@
 make sfio/sfmove.c
 prev sfio/sfhdr.h implicit
 done sfio/sfmove.c
-meta sfmove.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfmove.c sfmove
+meta sfmove.o %.c>%.o sfio/sfmove.c sfmove
 prev sfio/sfmove.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfmove.c
 done sfmove.o generated
@@ -4041,7 +4040,7 @@
 make sfio/sfnew.c
 prev sfio/sfhdr.h implicit
 done sfio/sfnew.c
-meta sfnew.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfnew.c sfnew
+meta sfnew.o %.c>%.o sfio/sfnew.c sfnew
 prev sfio/sfnew.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfnew.c
 done sfnew.o generated
@@ -4049,7 +4048,7 @@
 make sfio/sfpkrd.c
 prev sfio/sfhdr.h implicit
 done sfio/sfpkrd.c
-meta sfpkrd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfpkrd.c sfpkrd
+meta sfpkrd.o %.c>%.o sfio/sfpkrd.c sfpkrd
 prev sfio/sfpkrd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfpkrd.c
 done sfpkrd.o generated
@@ -4057,7 +4056,7 @@
 make sfio/sfnotify.c
 prev sfio/sfhdr.h implicit
 done sfio/sfnotify.c
-meta sfnotify.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfnotify.c sfnotify
+meta sfnotify.o %.c>%.o sfio/sfnotify.c sfnotify
 prev sfio/sfnotify.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfnotify.c
 done sfnotify.o generated
@@ -4065,7 +4064,7 @@
 make sfio/sfnputc.c
 prev sfio/sfhdr.h implicit
 done sfio/sfnputc.c
-meta sfnputc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfnputc.c sfnputc
+meta sfnputc.o %.c>%.o sfio/sfnputc.c sfnputc
 prev sfio/sfnputc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfnputc.c
 done sfnputc.o generated
@@ -4073,7 +4072,7 @@
 make sfio/sfopen.c
 prev sfio/sfhdr.h implicit
 done sfio/sfopen.c
-meta sfopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfopen.c sfopen
+meta sfopen.o %.c>%.o sfio/sfopen.c sfopen
 prev sfio/sfopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfopen.c
 done sfopen.o generated
@@ -4081,7 +4080,7 @@
 make sfio/sfpeek.c
 prev sfio/sfhdr.h implicit
 done sfio/sfpeek.c
-meta sfpeek.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfpeek.c sfpeek
+meta sfpeek.o %.c>%.o sfio/sfpeek.c sfpeek
 prev sfio/sfpeek.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfpeek.c
 done sfpeek.o generated
@@ -4089,7 +4088,7 @@
 make sfio/sfpoll.c
 prev sfio/sfhdr.h implicit
 done sfio/sfpoll.c
-meta sfpoll.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfpoll.c sfpoll
+meta sfpoll.o %.c>%.o sfio/sfpoll.c sfpoll
 prev sfio/sfpoll.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfpoll.c
 done sfpoll.o generated
@@ -4097,7 +4096,7 @@
 make sfio/sfpool.c
 prev sfio/sfhdr.h implicit
 done sfio/sfpool.c
-meta sfpool.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfpool.c sfpool
+meta sfpool.o %.c>%.o sfio/sfpool.c sfpool
 prev sfio/sfpool.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfpool.c
 done sfpool.o generated
@@ -4106,7 +4105,7 @@
 prev include/proc.h implicit
 prev sfio/sfhdr.h implicit
 done sfio/sfpopen.c
-meta sfpopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfpopen.c sfpopen
+meta sfpopen.o %.c>%.o sfio/sfpopen.c sfpopen
 prev sfio/sfpopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfpopen.c
 done sfpopen.o generated
@@ -4114,7 +4113,7 @@
 make sfio/sfprintf.c
 prev sfio/sfhdr.h implicit
 done sfio/sfprintf.c
-meta sfprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfprintf.c sfprintf
+meta sfprintf.o %.c>%.o sfio/sfprintf.c sfprintf
 prev sfio/sfprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfprintf.c
 done sfprintf.o generated
@@ -4122,7 +4121,7 @@
 make sfio/sfputd.c
 prev sfio/sfhdr.h implicit
 done sfio/sfputd.c
-meta sfputd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfputd.c sfputd
+meta sfputd.o %.c>%.o sfio/sfputd.c sfputd
 prev sfio/sfputd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfputd.c
 done sfputd.o generated
@@ -4130,7 +4129,7 @@
 make sfio/sfputl.c
 prev sfio/sfhdr.h implicit
 done sfio/sfputl.c
-meta sfputl.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfputl.c sfputl
+meta sfputl.o %.c>%.o sfio/sfputl.c sfputl
 prev sfio/sfputl.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfputl.c
 done sfputl.o generated
@@ -4138,7 +4137,7 @@
 make sfio/sfputr.c
 prev sfio/sfhdr.h implicit
 done sfio/sfputr.c
-meta sfputr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfputr.c sfputr
+meta sfputr.o %.c>%.o sfio/sfputr.c sfputr
 prev sfio/sfputr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfputr.c
 done sfputr.o generated
@@ -4146,7 +4145,7 @@
 make sfio/sfputu.c
 prev sfio/sfhdr.h implicit
 done sfio/sfputu.c
-meta sfputu.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfputu.c sfputu
+meta sfputu.o %.c>%.o sfio/sfputu.c sfputu
 prev sfio/sfputu.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfputu.c
 done sfputu.o generated
@@ -4154,7 +4153,7 @@
 make sfio/sfrd.c
 prev sfio/sfhdr.h implicit
 done sfio/sfrd.c
-meta sfrd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfrd.c sfrd
+meta sfrd.o %.c>%.o sfio/sfrd.c sfrd
 prev sfio/sfrd.c
 exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} 
-D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfrd.c
 done sfrd.o generated
@@ -4162,7 +4161,7 @@
 make sfio/sfread.c
 prev sfio/sfhdr.h implicit
 done sfio/sfread.c
-meta sfread.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfread.c sfread
+meta sfread.o %.c>%.o sfio/sfread.c sfread
 prev sfio/sfread.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfread.c
 done sfread.o generated
@@ -4170,7 +4169,7 @@
 make sfio/sfreserve.c
 prev sfio/sfhdr.h implicit
 done sfio/sfreserve.c
-meta sfreserve.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfreserve.c 
sfreserve
+meta sfreserve.o %.c>%.o sfio/sfreserve.c sfreserve
 prev sfio/sfreserve.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfreserve.c
 done sfreserve.o generated
@@ -4178,7 +4177,7 @@
 make sfio/sfscanf.c
 prev sfio/sfhdr.h implicit
 done sfio/sfscanf.c
-meta sfscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfscanf.c sfscanf
+meta sfscanf.o %.c>%.o sfio/sfscanf.c sfscanf
 prev sfio/sfscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfscanf.c
 done sfscanf.o generated
@@ -4186,7 +4185,7 @@
 make sfio/sfseek.c
 prev sfio/sfhdr.h implicit
 done sfio/sfseek.c
-meta sfseek.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfseek.c sfseek
+meta sfseek.o %.c>%.o sfio/sfseek.c sfseek
 prev sfio/sfseek.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfseek.c
 done sfseek.o generated
@@ -4194,7 +4193,7 @@
 make sfio/sfset.c
 prev sfio/sfhdr.h implicit
 done sfio/sfset.c
-meta sfset.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfset.c sfset
+meta sfset.o %.c>%.o sfio/sfset.c sfset
 prev sfio/sfset.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfset.c
 done sfset.o generated
@@ -4202,7 +4201,7 @@
 make sfio/sfsetbuf.c
 prev sfio/sfhdr.h implicit
 done sfio/sfsetbuf.c
-meta sfsetbuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfsetbuf.c sfsetbuf
+meta sfsetbuf.o %.c>%.o sfio/sfsetbuf.c sfsetbuf
 prev sfio/sfsetbuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfsetbuf.c
 done sfsetbuf.o generated
@@ -4210,7 +4209,7 @@
 make sfio/sfsetfd.c
 prev sfio/sfhdr.h implicit
 done sfio/sfsetfd.c
-meta sfsetfd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfsetfd.c sfsetfd
+meta sfsetfd.o %.c>%.o sfio/sfsetfd.c sfsetfd
 prev sfio/sfsetfd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfsetfd.c
 done sfsetfd.o generated
@@ -4218,7 +4217,7 @@
 make sfio/sfsize.c
 prev sfio/sfhdr.h implicit
 done sfio/sfsize.c
-meta sfsize.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfsize.c sfsize
+meta sfsize.o %.c>%.o sfio/sfsize.c sfsize
 prev sfio/sfsize.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfsize.c
 done sfsize.o generated
@@ -4226,7 +4225,7 @@
 make sfio/sfsk.c
 prev sfio/sfhdr.h implicit
 done sfio/sfsk.c
-meta sfsk.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfsk.c sfsk
+meta sfsk.o %.c>%.o sfio/sfsk.c sfsk
 prev sfio/sfsk.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfsk.c
 done sfsk.o generated
@@ -4234,7 +4233,7 @@
 make sfio/sfstack.c
 prev sfio/sfhdr.h implicit
 done sfio/sfstack.c
-meta sfstack.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfstack.c sfstack
+meta sfstack.o %.c>%.o sfio/sfstack.c sfstack
 prev sfio/sfstack.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfstack.c
 done sfstack.o generated
@@ -4242,7 +4241,7 @@
 make sfio/sfstrtod.c
 prev sfio/sfhdr.h implicit
 done sfio/sfstrtod.c
-meta sfstrtod.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfstrtod.c sfstrtod
+meta sfstrtod.o %.c>%.o sfio/sfstrtod.c sfstrtod
 prev sfio/sfstrtod.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfstrtod.c
 done sfstrtod.o generated
@@ -4250,7 +4249,7 @@
 make sfio/sfsync.c
 prev sfio/sfhdr.h implicit
 done sfio/sfsync.c
-meta sfsync.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfsync.c sfsync
+meta sfsync.o %.c>%.o sfio/sfsync.c sfsync
 prev sfio/sfsync.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfsync.c
 done sfsync.o generated
@@ -4258,14 +4257,14 @@
 make sfio/sfswap.c
 prev sfio/sfhdr.h implicit
 done sfio/sfswap.c
-meta sfswap.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfswap.c sfswap
+meta sfswap.o %.c>%.o sfio/sfswap.c sfswap
 prev sfio/sfswap.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfswap.c
 done sfswap.o generated
 make sftable.o
 make sfio/sftable.c
 make FEATURE/sfinit implicit
-meta FEATURE/sfinit features/%.c>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/sfinit.c sfinit
+meta FEATURE/sfinit features/%.c>FEATURE/% features/sfinit.c sfinit
 make features/sfinit.c
 prev FEATURE/float implicit
 prev FEATURE/common implicit
@@ -4277,7 +4276,7 @@
 prev FEATURE/float implicit
 prev sfio/sfhdr.h implicit
 done sfio/sftable.c
-meta sftable.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sftable.c sftable
+meta sftable.o %.c>%.o sfio/sftable.c sftable
 prev sfio/sftable.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sftable.c
 done sftable.o generated
@@ -4285,7 +4284,7 @@
 make sfio/sftell.c
 prev sfio/sfhdr.h implicit
 done sfio/sftell.c
-meta sftell.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sftell.c sftell
+meta sftell.o %.c>%.o sfio/sftell.c sftell
 prev sfio/sftell.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sftell.c
 done sftell.o generated
@@ -4293,7 +4292,7 @@
 make sfio/sftmp.c
 prev sfio/sfhdr.h implicit
 done sfio/sftmp.c
-meta sftmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sftmp.c sftmp
+meta sftmp.o %.c>%.o sfio/sftmp.c sftmp
 prev sfio/sftmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sftmp.c
 done sftmp.o generated
@@ -4301,7 +4300,7 @@
 make sfio/sfungetc.c
 prev sfio/sfhdr.h implicit
 done sfio/sfungetc.c
-meta sfungetc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfungetc.c sfungetc
+meta sfungetc.o %.c>%.o sfio/sfungetc.c sfungetc
 prev sfio/sfungetc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfungetc.c
 done sfungetc.o generated
@@ -4310,7 +4309,7 @@
 prev include/ccode.h implicit
 prev sfio/sfhdr.h implicit
 done sfio/sfvprintf.c
-meta sfvprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfvprintf.c 
sfvprintf
+meta sfvprintf.o %.c>%.o sfio/sfvprintf.c sfvprintf
 prev sfio/sfvprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} 
-D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -Icomp -Iport -Isfio -Iinclude -Istd 
-I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvprintf.c
 done sfvprintf.o generated
@@ -4319,7 +4318,7 @@
 prev sfio/sfstrtof.h implicit
 prev sfio/sfhdr.h implicit
 done sfio/sfvscanf.c
-meta sfvscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfvscanf.c sfvscanf
+meta sfvscanf.o %.c>%.o sfio/sfvscanf.c sfvscanf
 prev sfio/sfvscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfvscanf.c
 done sfvscanf.o generated
@@ -4327,7 +4326,7 @@
 make sfio/sfwr.c
 prev sfio/sfhdr.h implicit
 done sfio/sfwr.c
-meta sfwr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfwr.c sfwr
+meta sfwr.o %.c>%.o sfio/sfwr.c sfwr
 prev sfio/sfwr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfwr.c
 done sfwr.o generated
@@ -4335,7 +4334,7 @@
 make sfio/sfwrite.c
 prev sfio/sfhdr.h implicit
 done sfio/sfwrite.c
-meta sfwrite.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfwrite.c sfwrite
+meta sfwrite.o %.c>%.o sfio/sfwrite.c sfwrite
 prev sfio/sfwrite.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfwrite.c
 done sfwrite.o generated
@@ -4343,7 +4342,7 @@
 make sfio/sfpurge.c
 prev sfio/sfhdr.h implicit
 done sfio/sfpurge.c
-meta sfpurge.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfpurge.c sfpurge
+meta sfpurge.o %.c>%.o sfio/sfpurge.c sfpurge
 prev sfio/sfpurge.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfpurge.c
 done sfpurge.o generated
@@ -4351,7 +4350,7 @@
 make sfio/sfraise.c
 prev sfio/sfhdr.h implicit
 done sfio/sfraise.c
-meta sfraise.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfraise.c sfraise
+meta sfraise.o %.c>%.o sfio/sfraise.c sfraise
 prev sfio/sfraise.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfraise.c
 done sfraise.o generated
@@ -4359,7 +4358,7 @@
 make sfio/sfgetm.c
 prev sfio/sfhdr.h implicit
 done sfio/sfgetm.c
-meta sfgetm.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfgetm.c sfgetm
+meta sfgetm.o %.c>%.o sfio/sfgetm.c sfgetm
 prev sfio/sfgetm.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfgetm.c
 done sfgetm.o generated
@@ -4367,7 +4366,7 @@
 make sfio/sfmutex.c
 prev sfio/sfhdr.h implicit
 done sfio/sfmutex.c
-meta sfmutex.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfmutex.c sfmutex
+meta sfmutex.o %.c>%.o sfio/sfmutex.c sfmutex
 prev sfio/sfmutex.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfmutex.c
 done sfmutex.o generated
@@ -4375,7 +4374,7 @@
 make sfio/sfputm.c
 prev sfio/sfhdr.h implicit
 done sfio/sfputm.c
-meta sfputm.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfputm.c sfputm
+meta sfputm.o %.c>%.o sfio/sfputm.c sfputm
 prev sfio/sfputm.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfputm.c
 done sfputm.o generated
@@ -4383,7 +4382,7 @@
 make sfio/sfresize.c
 prev sfio/sfhdr.h implicit
 done sfio/sfresize.c
-meta sfresize.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/sfresize.c sfresize
+meta sfresize.o %.c>%.o sfio/sfresize.c sfresize
 prev sfio/sfresize.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/sfresize.c
 done sfresize.o generated
@@ -4391,7 +4390,7 @@
 make sfio/_sfclrerr.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfclrerr.c
-meta _sfclrerr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfclrerr.c 
_sfclrerr
+meta _sfclrerr.o %.c>%.o sfio/_sfclrerr.c _sfclrerr
 prev sfio/_sfclrerr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfclrerr.c
 done _sfclrerr.o generated
@@ -4399,7 +4398,7 @@
 make sfio/_sfeof.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfeof.c
-meta _sfeof.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfeof.c _sfeof
+meta _sfeof.o %.c>%.o sfio/_sfeof.c _sfeof
 prev sfio/_sfeof.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfeof.c
 done _sfeof.o generated
@@ -4407,7 +4406,7 @@
 make sfio/_sferror.c
 prev sfio/sfhdr.h implicit
 done sfio/_sferror.c
-meta _sferror.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sferror.c _sferror
+meta _sferror.o %.c>%.o sfio/_sferror.c _sferror
 prev sfio/_sferror.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sferror.c
 done _sferror.o generated
@@ -4415,7 +4414,7 @@
 make sfio/_sffileno.c
 prev sfio/sfhdr.h implicit
 done sfio/_sffileno.c
-meta _sffileno.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sffileno.c 
_sffileno
+meta _sffileno.o %.c>%.o sfio/_sffileno.c _sffileno
 prev sfio/_sffileno.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sffileno.c
 done _sffileno.o generated
@@ -4423,7 +4422,7 @@
 make sfio/_sfopen.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfopen.c
-meta _sfopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfopen.c _sfopen
+meta _sfopen.o %.c>%.o sfio/_sfopen.c _sfopen
 prev sfio/_sfopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfopen.c
 done _sfopen.o generated
@@ -4431,7 +4430,7 @@
 make sfio/_sfstacked.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfstacked.c
-meta _sfstacked.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfstacked.c 
_sfstacked
+meta _sfstacked.o %.c>%.o sfio/_sfstacked.c _sfstacked
 prev sfio/_sfstacked.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfstacked.c
 done _sfstacked.o generated
@@ -4439,7 +4438,7 @@
 make sfio/_sfvalue.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfvalue.c
-meta _sfvalue.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfvalue.c _sfvalue
+meta _sfvalue.o %.c>%.o sfio/_sfvalue.c _sfvalue
 prev sfio/_sfvalue.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfvalue.c
 done _sfvalue.o generated
@@ -4447,7 +4446,7 @@
 make sfio/_sfgetc.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfgetc.c
-meta _sfgetc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfgetc.c _sfgetc
+meta _sfgetc.o %.c>%.o sfio/_sfgetc.c _sfgetc
 prev sfio/_sfgetc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfgetc.c
 done _sfgetc.o generated
@@ -4455,7 +4454,7 @@
 make sfio/_sfgetl.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfgetl.c
-meta _sfgetl.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfgetl.c _sfgetl
+meta _sfgetl.o %.c>%.o sfio/_sfgetl.c _sfgetl
 prev sfio/_sfgetl.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfgetl.c
 done _sfgetl.o generated
@@ -4463,7 +4462,7 @@
 make sfio/_sfgetl2.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfgetl2.c
-meta _sfgetl2.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfgetl2.c _sfgetl2
+meta _sfgetl2.o %.c>%.o sfio/_sfgetl2.c _sfgetl2
 prev sfio/_sfgetl2.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfgetl2.c
 done _sfgetl2.o generated
@@ -4471,7 +4470,7 @@
 make sfio/_sfgetu.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfgetu.c
-meta _sfgetu.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfgetu.c _sfgetu
+meta _sfgetu.o %.c>%.o sfio/_sfgetu.c _sfgetu
 prev sfio/_sfgetu.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfgetu.c
 done _sfgetu.o generated
@@ -4479,7 +4478,7 @@
 make sfio/_sfgetu2.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfgetu2.c
-meta _sfgetu2.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfgetu2.c _sfgetu2
+meta _sfgetu2.o %.c>%.o sfio/_sfgetu2.c _sfgetu2
 prev sfio/_sfgetu2.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfgetu2.c
 done _sfgetu2.o generated
@@ -4487,7 +4486,7 @@
 make sfio/_sfdlen.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfdlen.c
-meta _sfdlen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfdlen.c _sfdlen
+meta _sfdlen.o %.c>%.o sfio/_sfdlen.c _sfdlen
 prev sfio/_sfdlen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfdlen.c
 done _sfdlen.o generated
@@ -4495,7 +4494,7 @@
 make sfio/_sfllen.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfllen.c
-meta _sfllen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfllen.c _sfllen
+meta _sfllen.o %.c>%.o sfio/_sfllen.c _sfllen
 prev sfio/_sfllen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfllen.c
 done _sfllen.o generated
@@ -4503,7 +4502,7 @@
 make sfio/_sfslen.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfslen.c
-meta _sfslen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfslen.c _sfslen
+meta _sfslen.o %.c>%.o sfio/_sfslen.c _sfslen
 prev sfio/_sfslen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfslen.c
 done _sfslen.o generated
@@ -4511,7 +4510,7 @@
 make sfio/_sfulen.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfulen.c
-meta _sfulen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfulen.c _sfulen
+meta _sfulen.o %.c>%.o sfio/_sfulen.c _sfulen
 prev sfio/_sfulen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfulen.c
 done _sfulen.o generated
@@ -4519,7 +4518,7 @@
 make sfio/_sfputc.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfputc.c
-meta _sfputc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfputc.c _sfputc
+meta _sfputc.o %.c>%.o sfio/_sfputc.c _sfputc
 prev sfio/_sfputc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfputc.c
 done _sfputc.o generated
@@ -4527,7 +4526,7 @@
 make sfio/_sfputd.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfputd.c
-meta _sfputd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfputd.c _sfputd
+meta _sfputd.o %.c>%.o sfio/_sfputd.c _sfputd
 prev sfio/_sfputd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfputd.c
 done _sfputd.o generated
@@ -4535,7 +4534,7 @@
 make sfio/_sfputl.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfputl.c
-meta _sfputl.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfputl.c _sfputl
+meta _sfputl.o %.c>%.o sfio/_sfputl.c _sfputl
 prev sfio/_sfputl.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfputl.c
 done _sfputl.o generated
@@ -4543,7 +4542,7 @@
 make sfio/_sfputm.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfputm.c
-meta _sfputm.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfputm.c _sfputm
+meta _sfputm.o %.c>%.o sfio/_sfputm.c _sfputm
 prev sfio/_sfputm.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfputm.c
 done _sfputm.o generated
@@ -4551,7 +4550,7 @@
 make sfio/_sfputu.c
 prev sfio/sfhdr.h implicit
 done sfio/_sfputu.c
-meta _sfputu.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/sfio/_sfputu.c _sfputu
+meta _sfputu.o %.c>%.o sfio/_sfputu.c _sfputu
 prev sfio/_sfputu.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c sfio/_sfputu.c
 done _sfputu.o generated
@@ -4562,7 +4561,7 @@
 prev sfio/sfhdr.h implicit
 done stdio/stdhdr.h
 done stdio/clearerr.c
-meta clearerr.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/clearerr.c clearerr
+meta clearerr.o %.c>%.o stdio/clearerr.c clearerr
 prev stdio/clearerr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/clearerr.c
 done clearerr.o generated
@@ -4570,7 +4569,7 @@
 make stdio/fclose.c
 prev stdio/stdhdr.h implicit
 done stdio/fclose.c
-meta fclose.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fclose.c fclose
+meta fclose.o %.c>%.o stdio/fclose.c fclose
 prev stdio/fclose.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fclose.c
 done fclose.o generated
@@ -4578,7 +4577,7 @@
 make stdio/fdopen.c
 prev stdio/stdhdr.h implicit
 done stdio/fdopen.c
-meta fdopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fdopen.c fdopen
+meta fdopen.o %.c>%.o stdio/fdopen.c fdopen
 prev stdio/fdopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fdopen.c
 done fdopen.o generated
@@ -4586,7 +4585,7 @@
 make stdio/feof.c
 prev stdio/stdhdr.h implicit
 done stdio/feof.c
-meta feof.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/feof.c feof
+meta feof.o %.c>%.o stdio/feof.c feof
 prev stdio/feof.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/feof.c
 done feof.o generated
@@ -4594,7 +4593,7 @@
 make stdio/ferror.c
 prev stdio/stdhdr.h implicit
 done stdio/ferror.c
-meta ferror.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/ferror.c ferror
+meta ferror.o %.c>%.o stdio/ferror.c ferror
 prev stdio/ferror.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/ferror.c
 done ferror.o generated
@@ -4602,7 +4601,7 @@
 make stdio/fflush.c
 prev stdio/stdhdr.h implicit
 done stdio/fflush.c
-meta fflush.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fflush.c fflush
+meta fflush.o %.c>%.o stdio/fflush.c fflush
 prev stdio/fflush.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fflush.c
 done fflush.o generated
@@ -4610,7 +4609,7 @@
 make stdio/fgetc.c
 prev stdio/stdhdr.h implicit
 done stdio/fgetc.c
-meta fgetc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fgetc.c fgetc
+meta fgetc.o %.c>%.o stdio/fgetc.c fgetc
 prev stdio/fgetc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fgetc.c
 done fgetc.o generated
@@ -4618,7 +4617,7 @@
 make stdio/fgetpos.c
 prev stdio/stdhdr.h implicit
 done stdio/fgetpos.c
-meta fgetpos.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fgetpos.c fgetpos
+meta fgetpos.o %.c>%.o stdio/fgetpos.c fgetpos
 prev stdio/fgetpos.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fgetpos.c
 done fgetpos.o generated
@@ -4626,7 +4625,7 @@
 make stdio/fgets.c
 prev stdio/stdhdr.h implicit
 done stdio/fgets.c
-meta fgets.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fgets.c fgets
+meta fgets.o %.c>%.o stdio/fgets.c fgets
 prev stdio/fgets.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fgets.c
 done fgets.o generated
@@ -4634,7 +4633,7 @@
 make stdio/fileno.c
 prev stdio/stdhdr.h implicit
 done stdio/fileno.c
-meta fileno.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fileno.c fileno
+meta fileno.o %.c>%.o stdio/fileno.c fileno
 prev stdio/fileno.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fileno.c
 done fileno.o generated
@@ -4642,7 +4641,7 @@
 make stdio/fopen.c
 prev stdio/stdhdr.h implicit
 done stdio/fopen.c
-meta fopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fopen.c fopen
+meta fopen.o %.c>%.o stdio/fopen.c fopen
 prev stdio/fopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fopen.c
 done fopen.o generated
@@ -4650,7 +4649,7 @@
 make stdio/fprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/fprintf.c
-meta fprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fprintf.c fprintf
+meta fprintf.o %.c>%.o stdio/fprintf.c fprintf
 prev stdio/fprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fprintf.c
 done fprintf.o generated
@@ -4658,7 +4657,7 @@
 make stdio/fpurge.c
 prev stdio/stdhdr.h implicit
 done stdio/fpurge.c
-meta fpurge.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fpurge.c fpurge
+meta fpurge.o %.c>%.o stdio/fpurge.c fpurge
 prev stdio/fpurge.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fpurge.c
 done fpurge.o generated
@@ -4666,7 +4665,7 @@
 make stdio/fputc.c
 prev stdio/stdhdr.h implicit
 done stdio/fputc.c
-meta fputc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fputc.c fputc
+meta fputc.o %.c>%.o stdio/fputc.c fputc
 prev stdio/fputc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fputc.c
 done fputc.o generated
@@ -4674,7 +4673,7 @@
 make stdio/fputs.c
 prev stdio/stdhdr.h implicit
 done stdio/fputs.c
-meta fputs.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fputs.c fputs
+meta fputs.o %.c>%.o stdio/fputs.c fputs
 prev stdio/fputs.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fputs.c
 done fputs.o generated
@@ -4682,7 +4681,7 @@
 make stdio/fread.c
 prev stdio/stdhdr.h implicit
 done stdio/fread.c
-meta fread.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fread.c fread
+meta fread.o %.c>%.o stdio/fread.c fread
 prev stdio/fread.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fread.c
 done fread.o generated
@@ -4690,7 +4689,7 @@
 make stdio/freopen.c
 prev stdio/stdhdr.h implicit
 done stdio/freopen.c
-meta freopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/freopen.c freopen
+meta freopen.o %.c>%.o stdio/freopen.c freopen
 prev stdio/freopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/freopen.c
 done freopen.o generated
@@ -4698,7 +4697,7 @@
 make stdio/fscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/fscanf.c
-meta fscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fscanf.c fscanf
+meta fscanf.o %.c>%.o stdio/fscanf.c fscanf
 prev stdio/fscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fscanf.c
 done fscanf.o generated
@@ -4706,7 +4705,7 @@
 make stdio/fseek.c
 prev stdio/stdhdr.h implicit
 done stdio/fseek.c
-meta fseek.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fseek.c fseek
+meta fseek.o %.c>%.o stdio/fseek.c fseek
 prev stdio/fseek.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fseek.c
 done fseek.o generated
@@ -4714,7 +4713,7 @@
 make stdio/fseeko.c
 prev stdio/stdhdr.h implicit
 done stdio/fseeko.c
-meta fseeko.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fseeko.c fseeko
+meta fseeko.o %.c>%.o stdio/fseeko.c fseeko
 prev stdio/fseeko.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fseeko.c
 done fseeko.o generated
@@ -4722,7 +4721,7 @@
 make stdio/fsetpos.c
 prev stdio/stdhdr.h implicit
 done stdio/fsetpos.c
-meta fsetpos.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fsetpos.c fsetpos
+meta fsetpos.o %.c>%.o stdio/fsetpos.c fsetpos
 prev stdio/fsetpos.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fsetpos.c
 done fsetpos.o generated
@@ -4730,7 +4729,7 @@
 make stdio/ftell.c
 prev stdio/stdhdr.h implicit
 done stdio/ftell.c
-meta ftell.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/ftell.c ftell
+meta ftell.o %.c>%.o stdio/ftell.c ftell
 prev stdio/ftell.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/ftell.c
 done ftell.o generated
@@ -4738,7 +4737,7 @@
 make stdio/ftello.c
 prev stdio/stdhdr.h implicit
 done stdio/ftello.c
-meta ftello.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/ftello.c ftello
+meta ftello.o %.c>%.o stdio/ftello.c ftello
 prev stdio/ftello.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/ftello.c
 done ftello.o generated
@@ -4746,7 +4745,7 @@
 make stdio/fwrite.c
 prev stdio/stdhdr.h implicit
 done stdio/fwrite.c
-meta fwrite.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fwrite.c fwrite
+meta fwrite.o %.c>%.o stdio/fwrite.c fwrite
 prev stdio/fwrite.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fwrite.c
 done fwrite.o generated
@@ -4754,7 +4753,7 @@
 make stdio/getc.c
 prev stdio/stdhdr.h implicit
 done stdio/getc.c
-meta getc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/getc.c getc
+meta getc.o %.c>%.o stdio/getc.c getc
 prev stdio/getc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/getc.c
 done getc.o generated
@@ -4762,7 +4761,7 @@
 make stdio/getchar.c
 prev stdio/stdhdr.h implicit
 done stdio/getchar.c
-meta getchar.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/getchar.c getchar
+meta getchar.o %.c>%.o stdio/getchar.c getchar
 prev stdio/getchar.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/getchar.c
 done getchar.o generated
@@ -4770,7 +4769,7 @@
 make stdio/getw.c
 prev stdio/stdhdr.h implicit
 done stdio/getw.c
-meta getw.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/getw.c getw
+meta getw.o %.c>%.o stdio/getw.c getw
 prev stdio/getw.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/getw.c
 done getw.o generated
@@ -4778,7 +4777,7 @@
 make stdio/pclose.c
 prev stdio/stdhdr.h implicit
 done stdio/pclose.c
-meta pclose.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/pclose.c pclose
+meta pclose.o %.c>%.o stdio/pclose.c pclose
 prev stdio/pclose.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/pclose.c
 done pclose.o generated
@@ -4786,7 +4785,7 @@
 make stdio/popen.c
 prev stdio/stdhdr.h implicit
 done stdio/popen.c
-meta popen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/popen.c popen
+meta popen.o %.c>%.o stdio/popen.c popen
 prev stdio/popen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/popen.c
 done popen.o generated
@@ -4794,7 +4793,7 @@
 make stdio/printf.c
 prev stdio/stdhdr.h implicit
 done stdio/printf.c
-meta printf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/printf.c printf
+meta printf.o %.c>%.o stdio/printf.c printf
 prev stdio/printf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/printf.c
 done printf.o generated
@@ -4802,7 +4801,7 @@
 make stdio/putc.c
 prev stdio/stdhdr.h implicit
 done stdio/putc.c
-meta putc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/putc.c putc
+meta putc.o %.c>%.o stdio/putc.c putc
 prev stdio/putc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/putc.c
 done putc.o generated
@@ -4810,7 +4809,7 @@
 make stdio/putchar.c
 prev stdio/stdhdr.h implicit
 done stdio/putchar.c
-meta putchar.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/putchar.c putchar
+meta putchar.o %.c>%.o stdio/putchar.c putchar
 prev stdio/putchar.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/putchar.c
 done putchar.o generated
@@ -4818,7 +4817,7 @@
 make stdio/puts.c
 prev stdio/stdhdr.h implicit
 done stdio/puts.c
-meta puts.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/puts.c puts
+meta puts.o %.c>%.o stdio/puts.c puts
 prev stdio/puts.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/puts.c
 done puts.o generated
@@ -4826,7 +4825,7 @@
 make stdio/putw.c
 prev stdio/stdhdr.h implicit
 done stdio/putw.c
-meta putw.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/putw.c putw
+meta putw.o %.c>%.o stdio/putw.c putw
 prev stdio/putw.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/putw.c
 done putw.o generated
@@ -4834,7 +4833,7 @@
 make stdio/rewind.c
 prev stdio/stdhdr.h implicit
 done stdio/rewind.c
-meta rewind.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/rewind.c rewind
+meta rewind.o %.c>%.o stdio/rewind.c rewind
 prev stdio/rewind.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/rewind.c
 done rewind.o generated
@@ -4842,7 +4841,7 @@
 make stdio/scanf.c
 prev stdio/stdhdr.h implicit
 done stdio/scanf.c
-meta scanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/scanf.c scanf
+meta scanf.o %.c>%.o stdio/scanf.c scanf
 prev stdio/scanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/scanf.c
 done scanf.o generated
@@ -4850,7 +4849,7 @@
 make stdio/setbuf.c
 prev stdio/stdhdr.h implicit
 done stdio/setbuf.c
-meta setbuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/setbuf.c setbuf
+meta setbuf.o %.c>%.o stdio/setbuf.c setbuf
 prev stdio/setbuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/setbuf.c
 done setbuf.o generated
@@ -4858,7 +4857,7 @@
 make stdio/setbuffer.c
 prev stdio/stdhdr.h implicit
 done stdio/setbuffer.c
-meta setbuffer.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/setbuffer.c 
setbuffer
+meta setbuffer.o %.c>%.o stdio/setbuffer.c setbuffer
 prev stdio/setbuffer.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/setbuffer.c
 done setbuffer.o generated
@@ -4866,7 +4865,7 @@
 make stdio/setlinebuf.c
 prev stdio/stdhdr.h implicit
 done stdio/setlinebuf.c
-meta setlinebuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/setlinebuf.c 
setlinebuf
+meta setlinebuf.o %.c>%.o stdio/setlinebuf.c setlinebuf
 prev stdio/setlinebuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/setlinebuf.c
 done setlinebuf.o generated
@@ -4874,7 +4873,7 @@
 make stdio/setvbuf.c
 prev stdio/stdhdr.h implicit
 done stdio/setvbuf.c
-meta setvbuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/setvbuf.c setvbuf
+meta setvbuf.o %.c>%.o stdio/setvbuf.c setvbuf
 prev stdio/setvbuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/setvbuf.c
 done setvbuf.o generated
@@ -4882,7 +4881,7 @@
 make stdio/snprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/snprintf.c
-meta snprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/snprintf.c snprintf
+meta snprintf.o %.c>%.o stdio/snprintf.c snprintf
 prev stdio/snprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/snprintf.c
 done snprintf.o generated
@@ -4890,7 +4889,7 @@
 make stdio/sprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/sprintf.c
-meta sprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/sprintf.c sprintf
+meta sprintf.o %.c>%.o stdio/sprintf.c sprintf
 prev stdio/sprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/sprintf.c
 done sprintf.o generated
@@ -4898,7 +4897,7 @@
 make stdio/sscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/sscanf.c
-meta sscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/sscanf.c sscanf
+meta sscanf.o %.c>%.o stdio/sscanf.c sscanf
 prev stdio/sscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/sscanf.c
 done sscanf.o generated
@@ -4906,7 +4905,7 @@
 make stdio/asprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/asprintf.c
-meta asprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/asprintf.c asprintf
+meta asprintf.o %.c>%.o stdio/asprintf.c asprintf
 prev stdio/asprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/asprintf.c
 done asprintf.o generated
@@ -4914,7 +4913,7 @@
 make stdio/vasprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/vasprintf.c
-meta vasprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vasprintf.c 
vasprintf
+meta vasprintf.o %.c>%.o stdio/vasprintf.c vasprintf
 prev stdio/vasprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vasprintf.c
 done vasprintf.o generated
@@ -4922,7 +4921,7 @@
 make stdio/tmpfile.c
 prev stdio/stdhdr.h implicit
 done stdio/tmpfile.c
-meta tmpfile.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/tmpfile.c tmpfile
+meta tmpfile.o %.c>%.o stdio/tmpfile.c tmpfile
 prev stdio/tmpfile.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/tmpfile.c
 done tmpfile.o generated
@@ -4930,7 +4929,7 @@
 make stdio/ungetc.c
 prev stdio/stdhdr.h implicit
 done stdio/ungetc.c
-meta ungetc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/ungetc.c ungetc
+meta ungetc.o %.c>%.o stdio/ungetc.c ungetc
 prev stdio/ungetc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/ungetc.c
 done ungetc.o generated
@@ -4938,7 +4937,7 @@
 make stdio/vfprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/vfprintf.c
-meta vfprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vfprintf.c vfprintf
+meta vfprintf.o %.c>%.o stdio/vfprintf.c vfprintf
 prev stdio/vfprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vfprintf.c
 done vfprintf.o generated
@@ -4946,7 +4945,7 @@
 make stdio/vfscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/vfscanf.c
-meta vfscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vfscanf.c vfscanf
+meta vfscanf.o %.c>%.o stdio/vfscanf.c vfscanf
 prev stdio/vfscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vfscanf.c
 done vfscanf.o generated
@@ -4954,7 +4953,7 @@
 make stdio/vprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/vprintf.c
-meta vprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vprintf.c vprintf
+meta vprintf.o %.c>%.o stdio/vprintf.c vprintf
 prev stdio/vprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vprintf.c
 done vprintf.o generated
@@ -4962,7 +4961,7 @@
 make stdio/vscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/vscanf.c
-meta vscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vscanf.c vscanf
+meta vscanf.o %.c>%.o stdio/vscanf.c vscanf
 prev stdio/vscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vscanf.c
 done vscanf.o generated
@@ -4970,7 +4969,7 @@
 make stdio/vsnprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/vsnprintf.c
-meta vsnprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vsnprintf.c 
vsnprintf
+meta vsnprintf.o %.c>%.o stdio/vsnprintf.c vsnprintf
 prev stdio/vsnprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vsnprintf.c
 done vsnprintf.o generated
@@ -4978,7 +4977,7 @@
 make stdio/vsprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/vsprintf.c
-meta vsprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vsprintf.c vsprintf
+meta vsprintf.o %.c>%.o stdio/vsprintf.c vsprintf
 prev stdio/vsprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vsprintf.c
 done vsprintf.o generated
@@ -4986,7 +4985,7 @@
 make stdio/vsscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/vsscanf.c
-meta vsscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vsscanf.c vsscanf
+meta vsscanf.o %.c>%.o stdio/vsscanf.c vsscanf
 prev stdio/vsscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vsscanf.c
 done vsscanf.o generated
@@ -4994,7 +4993,7 @@
 make stdio/_doprnt.c
 prev stdio/stdhdr.h implicit
 done stdio/_doprnt.c
-meta _doprnt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_doprnt.c _doprnt
+meta _doprnt.o %.c>%.o stdio/_doprnt.c _doprnt
 prev stdio/_doprnt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_doprnt.c
 done _doprnt.o generated
@@ -5002,7 +5001,7 @@
 make stdio/_doscan.c
 prev stdio/stdhdr.h implicit
 done stdio/_doscan.c
-meta _doscan.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_doscan.c _doscan
+meta _doscan.o %.c>%.o stdio/_doscan.c _doscan
 prev stdio/_doscan.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_doscan.c
 done _doscan.o generated
@@ -5010,7 +5009,7 @@
 make stdio/_filbuf.c
 prev stdio/stdhdr.h implicit
 done stdio/_filbuf.c
-meta _filbuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_filbuf.c _filbuf
+meta _filbuf.o %.c>%.o stdio/_filbuf.c _filbuf
 prev stdio/_filbuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_filbuf.c
 done _filbuf.o generated
@@ -5018,7 +5017,7 @@
 make stdio/_flsbuf.c
 prev stdio/stdhdr.h implicit
 done stdio/_flsbuf.c
-meta _flsbuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_flsbuf.c _flsbuf
+meta _flsbuf.o %.c>%.o stdio/_flsbuf.c _flsbuf
 prev stdio/_flsbuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_flsbuf.c
 done _flsbuf.o generated
@@ -5030,7 +5029,7 @@
 prev include/ast_windows.h implicit
 prev include/ast.h implicit
 done stdio/_stdfun.c
-meta _stdfun.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_stdfun.c _stdfun
+meta _stdfun.o %.c>%.o stdio/_stdfun.c _stdfun
 prev stdio/_stdfun.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_stdfun.c
 done _stdfun.o generated
@@ -5038,7 +5037,7 @@
 make stdio/_stdopen.c
 prev stdio/stdhdr.h implicit
 done stdio/_stdopen.c
-meta _stdopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_stdopen.c _stdopen
+meta _stdopen.o %.c>%.o stdio/_stdopen.c _stdopen
 prev stdio/_stdopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_stdopen.c
 done _stdopen.o generated
@@ -5046,7 +5045,7 @@
 make stdio/_stdprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/_stdprintf.c
-meta _stdprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_stdprintf.c 
_stdprintf
+meta _stdprintf.o %.c>%.o stdio/_stdprintf.c _stdprintf
 prev stdio/_stdprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_stdprintf.c
 done _stdprintf.o generated
@@ -5054,7 +5053,7 @@
 make stdio/_stdscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/_stdscanf.c
-meta _stdscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_stdscanf.c 
_stdscanf
+meta _stdscanf.o %.c>%.o stdio/_stdscanf.c _stdscanf
 prev stdio/_stdscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_stdscanf.c
 done _stdscanf.o generated
@@ -5062,7 +5061,7 @@
 make stdio/_stdsprnt.c
 prev stdio/stdhdr.h implicit
 done stdio/_stdsprnt.c
-meta _stdsprnt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_stdsprnt.c 
_stdsprnt
+meta _stdsprnt.o %.c>%.o stdio/_stdsprnt.c _stdsprnt
 prev stdio/_stdsprnt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_stdsprnt.c
 done _stdsprnt.o generated
@@ -5070,7 +5069,7 @@
 make stdio/_stdvbuf.c
 prev stdio/stdhdr.h implicit
 done stdio/_stdvbuf.c
-meta _stdvbuf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_stdvbuf.c _stdvbuf
+meta _stdvbuf.o %.c>%.o stdio/_stdvbuf.c _stdvbuf
 prev stdio/_stdvbuf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_stdvbuf.c
 done _stdvbuf.o generated
@@ -5078,7 +5077,7 @@
 make stdio/_stdvsnprnt.c
 prev stdio/stdhdr.h implicit
 done stdio/_stdvsnprnt.c
-meta _stdvsnprnt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_stdvsnprnt.c 
_stdvsnprnt
+meta _stdvsnprnt.o %.c>%.o stdio/_stdvsnprnt.c _stdvsnprnt
 prev stdio/_stdvsnprnt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_stdvsnprnt.c
 done _stdvsnprnt.o generated
@@ -5086,7 +5085,7 @@
 make stdio/_stdvsprnt.c
 prev stdio/stdhdr.h implicit
 done stdio/_stdvsprnt.c
-meta _stdvsprnt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_stdvsprnt.c 
_stdvsprnt
+meta _stdvsprnt.o %.c>%.o stdio/_stdvsprnt.c _stdvsprnt
 prev stdio/_stdvsprnt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_stdvsprnt.c
 done _stdvsprnt.o generated
@@ -5094,7 +5093,7 @@
 make stdio/_stdvsscn.c
 prev stdio/stdhdr.h implicit
 done stdio/_stdvsscn.c
-meta _stdvsscn.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/_stdvsscn.c 
_stdvsscn
+meta _stdvsscn.o %.c>%.o stdio/_stdvsscn.c _stdvsscn
 prev stdio/_stdvsscn.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/_stdvsscn.c
 done _stdvsscn.o generated
@@ -5102,7 +5101,7 @@
 make stdio/fgetwc.c
 prev stdio/stdhdr.h implicit
 done stdio/fgetwc.c
-meta fgetwc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fgetwc.c fgetwc
+meta fgetwc.o %.c>%.o stdio/fgetwc.c fgetwc
 prev stdio/fgetwc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fgetwc.c
 done fgetwc.o generated
@@ -5110,7 +5109,7 @@
 make stdio/fwprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/fwprintf.c
-meta fwprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fwprintf.c fwprintf
+meta fwprintf.o %.c>%.o stdio/fwprintf.c fwprintf
 prev stdio/fwprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fwprintf.c
 done fwprintf.o generated
@@ -5118,7 +5117,7 @@
 make stdio/putwchar.c
 prev stdio/stdhdr.h implicit
 done stdio/putwchar.c
-meta putwchar.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/putwchar.c putwchar
+meta putwchar.o %.c>%.o stdio/putwchar.c putwchar
 prev stdio/putwchar.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/putwchar.c
 done putwchar.o generated
@@ -5126,7 +5125,7 @@
 make stdio/vfwscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/vfwscanf.c
-meta vfwscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vfwscanf.c vfwscanf
+meta vfwscanf.o %.c>%.o stdio/vfwscanf.c vfwscanf
 prev stdio/vfwscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vfwscanf.c
 done vfwscanf.o generated
@@ -5134,7 +5133,7 @@
 make stdio/wprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/wprintf.c
-meta wprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/wprintf.c wprintf
+meta wprintf.o %.c>%.o stdio/wprintf.c wprintf
 prev stdio/wprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/wprintf.c
 done wprintf.o generated
@@ -5142,7 +5141,7 @@
 make stdio/fgetws.c
 prev stdio/stdhdr.h implicit
 done stdio/fgetws.c
-meta fgetws.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fgetws.c fgetws
+meta fgetws.o %.c>%.o stdio/fgetws.c fgetws
 prev stdio/fgetws.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fgetws.c
 done fgetws.o generated
@@ -5150,7 +5149,7 @@
 make stdio/fwscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/fwscanf.c
-meta fwscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fwscanf.c fwscanf
+meta fwscanf.o %.c>%.o stdio/fwscanf.c fwscanf
 prev stdio/fwscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fwscanf.c
 done fwscanf.o generated
@@ -5158,7 +5157,7 @@
 make stdio/swprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/swprintf.c
-meta swprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/swprintf.c swprintf
+meta swprintf.o %.c>%.o stdio/swprintf.c swprintf
 prev stdio/swprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/swprintf.c
 done swprintf.o generated
@@ -5166,7 +5165,7 @@
 make stdio/vswprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/vswprintf.c
-meta vswprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vswprintf.c 
vswprintf
+meta vswprintf.o %.c>%.o stdio/vswprintf.c vswprintf
 prev stdio/vswprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vswprintf.c
 done vswprintf.o generated
@@ -5174,7 +5173,7 @@
 make stdio/wscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/wscanf.c
-meta wscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/wscanf.c wscanf
+meta wscanf.o %.c>%.o stdio/wscanf.c wscanf
 prev stdio/wscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/wscanf.c
 done wscanf.o generated
@@ -5182,7 +5181,7 @@
 make stdio/fputwc.c
 prev stdio/stdhdr.h implicit
 done stdio/fputwc.c
-meta fputwc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fputwc.c fputwc
+meta fputwc.o %.c>%.o stdio/fputwc.c fputwc
 prev stdio/fputwc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fputwc.c
 done fputwc.o generated
@@ -5190,7 +5189,7 @@
 make stdio/getwc.c
 prev stdio/stdhdr.h implicit
 done stdio/getwc.c
-meta getwc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/getwc.c getwc
+meta getwc.o %.c>%.o stdio/getwc.c getwc
 prev stdio/getwc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/getwc.c
 done getwc.o generated
@@ -5198,7 +5197,7 @@
 make stdio/swscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/swscanf.c
-meta swscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/swscanf.c swscanf
+meta swscanf.o %.c>%.o stdio/swscanf.c swscanf
 prev stdio/swscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/swscanf.c
 done swscanf.o generated
@@ -5206,7 +5205,7 @@
 make stdio/vswscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/vswscanf.c
-meta vswscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vswscanf.c vswscanf
+meta vswscanf.o %.c>%.o stdio/vswscanf.c vswscanf
 prev stdio/vswscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vswscanf.c
 done vswscanf.o generated
@@ -5214,7 +5213,7 @@
 make stdio/fputws.c
 prev stdio/stdhdr.h implicit
 done stdio/fputws.c
-meta fputws.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fputws.c fputws
+meta fputws.o %.c>%.o stdio/fputws.c fputws
 prev stdio/fputws.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fputws.c
 done fputws.o generated
@@ -5222,7 +5221,7 @@
 make stdio/getwchar.c
 prev stdio/stdhdr.h implicit
 done stdio/getwchar.c
-meta getwchar.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/getwchar.c getwchar
+meta getwchar.o %.c>%.o stdio/getwchar.c getwchar
 prev stdio/getwchar.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/getwchar.c
 done getwchar.o generated
@@ -5230,7 +5229,7 @@
 make stdio/ungetwc.c
 prev stdio/stdhdr.h implicit
 done stdio/ungetwc.c
-meta ungetwc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/ungetwc.c ungetwc
+meta ungetwc.o %.c>%.o stdio/ungetwc.c ungetwc
 prev stdio/ungetwc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/ungetwc.c
 done ungetwc.o generated
@@ -5238,7 +5237,7 @@
 make stdio/vwprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/vwprintf.c
-meta vwprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vwprintf.c vwprintf
+meta vwprintf.o %.c>%.o stdio/vwprintf.c vwprintf
 prev stdio/vwprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vwprintf.c
 done vwprintf.o generated
@@ -5246,7 +5245,7 @@
 make stdio/fwide.c
 prev stdio/stdhdr.h implicit
 done stdio/fwide.c
-meta fwide.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/fwide.c fwide
+meta fwide.o %.c>%.o stdio/fwide.c fwide
 prev stdio/fwide.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/fwide.c
 done fwide.o generated
@@ -5254,7 +5253,7 @@
 make stdio/putwc.c
 prev stdio/stdhdr.h implicit
 done stdio/putwc.c
-meta putwc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/putwc.c putwc
+meta putwc.o %.c>%.o stdio/putwc.c putwc
 prev stdio/putwc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/putwc.c
 done putwc.o generated
@@ -5262,7 +5261,7 @@
 make stdio/vfwprintf.c
 prev stdio/stdhdr.h implicit
 done stdio/vfwprintf.c
-meta vfwprintf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vfwprintf.c 
vfwprintf
+meta vfwprintf.o %.c>%.o stdio/vfwprintf.c vfwprintf
 prev stdio/vfwprintf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vfwprintf.c
 done vfwprintf.o generated
@@ -5270,7 +5269,7 @@
 make stdio/vwscanf.c
 prev stdio/stdhdr.h implicit
 done stdio/vwscanf.c
-meta vwscanf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/vwscanf.c vwscanf
+meta vwscanf.o %.c>%.o stdio/vwscanf.c vwscanf
 prev stdio/vwscanf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/vwscanf.c
 done vwscanf.o generated
@@ -5278,7 +5277,7 @@
 make stdio/stdio_c99.c
 prev stdio/stdhdr.h implicit
 done stdio/stdio_c99.c
-meta stdio_c99.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/stdio_c99.c 
stdio_c99
+meta stdio_c99.o %.c>%.o stdio/stdio_c99.c stdio_c99
 prev stdio/stdio_c99.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/stdio_c99.c
 done stdio_c99.o generated
@@ -5286,7 +5285,7 @@
 make stdio/stdio_gnu.c
 prev stdio/stdhdr.h implicit
 done stdio/stdio_gnu.c
-meta stdio_gnu.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/stdio/stdio_gnu.c 
stdio_gnu
+meta stdio_gnu.o %.c>%.o stdio/stdio_gnu.c stdio_gnu
 prev stdio/stdio_gnu.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Istdio 
-Iinclude -Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c stdio/stdio_gnu.c
 done stdio_gnu.o generated
@@ -5295,7 +5294,7 @@
 prev FEATURE/float implicit
 prev include/ast.h implicit
 done comp/frexp.c
-meta frexp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/frexp.c frexp
+meta frexp.o %.c>%.o comp/frexp.c frexp
 prev comp/frexp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/frexp.c
 done frexp.o generated
@@ -5304,7 +5303,7 @@
 prev FEATURE/float implicit
 prev include/ast.h implicit
 done comp/frexpl.c
-meta frexpl.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/frexpl.c frexpl
+meta frexpl.o %.c>%.o comp/frexpl.c frexpl
 prev comp/frexpl.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/frexpl.c
 done frexpl.o generated
@@ -5317,14 +5316,14 @@
 done ast_mmap.h generated
 prev include/ast.h implicit
 done port/astcopy.c
-meta astcopy.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/astcopy.c astcopy
+meta astcopy.o %.c>%.o port/astcopy.c astcopy
 prev port/astcopy.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c port/astcopy.c
 done astcopy.o generated
 make astconf.o
 make port/astconf.c
 make FEATURE/libpath implicit
-meta FEATURE/libpath features/%.sh>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/libpath.sh libpath
+meta FEATURE/libpath features/%.sh>FEATURE/% features/libpath.sh libpath
 make features/libpath.sh
 done features/libpath.sh
 prev ast.req
@@ -5338,7 +5337,7 @@
 prev include/ast.h implicit
 prev misc/univlib.h implicit
 done port/astconf.c
-meta astconf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/astconf.c astconf
+meta astconf.o %.c>%.o port/astconf.c astconf
 prev port/astconf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Imisc -Iinclude -Istd 
-DCONF_LIBSUFFIX=\""${mam_cc_SUFFIX_DYNAMIC-${mam_cc_SUFFIX_SHARED}}"\" 
-DCONF_LIBPREFIX=\""${mam_cc_PREFIX_DYNAMIC-${mam_cc_PREFIX_SHARED}}"\" 
-DHOSTTYPE=\""${mam_cc_HOSTTYPE}"\" -D_PACKAGE_ast -c port/astconf.c
 done astconf.o generated
@@ -5349,7 +5348,7 @@
 prev include/ast.h implicit
 prev include/sfio_t.h implicit
 done port/astdynamic.c
-meta astdynamic.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/astdynamic.c 
astdynamic
+meta astdynamic.o %.c>%.o port/astdynamic.c astdynamic
 prev port/astdynamic.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iport -Isfio -Iinclude 
-Istd -I${INSTALLROOT}/include -D_PACKAGE_ast -c port/astdynamic.c
 done astdynamic.o generated
@@ -5357,7 +5356,7 @@
 make port/astlicense.c
 prev include/ast.h implicit
 done port/astlicense.c
-meta astlicense.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/astlicense.c 
astlicense
+meta astlicense.o %.c>%.o port/astlicense.c astlicense
 prev port/astlicense.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c port/astlicense.c
 done astlicense.o generated
@@ -5366,7 +5365,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done port/astquery.c
-meta astquery.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/astquery.c astquery
+meta astquery.o %.c>%.o port/astquery.c astquery
 prev port/astquery.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c port/astquery.c
 done astquery.o generated
@@ -5377,7 +5376,7 @@
 prev ast_tty.h implicit
 prev include/ast.h implicit
 done port/astwinsize.c
-meta astwinsize.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/astwinsize.c 
astwinsize
+meta astwinsize.o %.c>%.o port/astwinsize.c astwinsize
 prev port/astwinsize.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c port/astwinsize.c
 done astwinsize.o generated
@@ -5385,7 +5384,7 @@
 make port/aststatic.c
 prev include/ast.h implicit
 done port/aststatic.c
-meta aststatic.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/port/aststatic.c 
aststatic
+meta aststatic.o %.c>%.o port/aststatic.c aststatic
 prev port/aststatic.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c port/aststatic.c
 done aststatic.o generated
@@ -5395,7 +5394,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/getopt.c
-meta getopt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/getopt.c getopt
+meta getopt.o %.c>%.o comp/getopt.c getopt
 prev comp/getopt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/getopt.c
 done getopt.o generated
@@ -5406,7 +5405,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done comp/getoptl.c
-meta getoptl.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/comp/getoptl.c getoptl
+meta getoptl.o %.c>%.o comp/getoptl.c getoptl
 prev comp/getoptl.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c comp/getoptl.c
 done getoptl.o generated
@@ -5422,7 +5421,7 @@
 prev include/ast.h implicit
 done vmalloc/vmhdr.h dontcare
 done vmalloc/vmbest.c
-meta vmbest.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmbest.c vmbest
+meta vmbest.o %.c>%.o vmalloc/vmbest.c vmbest
 prev vmalloc/vmbest.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmbest.c
 done vmbest.o generated
@@ -5430,7 +5429,7 @@
 make vmalloc/vmclear.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmclear.c
-meta vmclear.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmclear.c vmclear
+meta vmclear.o %.c>%.o vmalloc/vmclear.c vmclear
 prev vmalloc/vmclear.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmclear.c
 done vmclear.o generated
@@ -5438,7 +5437,7 @@
 make vmalloc/vmclose.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmclose.c
-meta vmclose.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmclose.c vmclose
+meta vmclose.o %.c>%.o vmalloc/vmclose.c vmclose
 prev vmalloc/vmclose.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmclose.c
 done vmclose.o generated
@@ -5446,7 +5445,7 @@
 make vmalloc/vmdcheap.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmdcheap.c
-meta vmdcheap.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmdcheap.c 
vmdcheap
+meta vmdcheap.o %.c>%.o vmalloc/vmdcheap.c vmdcheap
 prev vmalloc/vmdcheap.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmdcheap.c
 done vmdcheap.o generated
@@ -5454,7 +5453,7 @@
 make vmalloc/vmdebug.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmdebug.c
-meta vmdebug.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmdebug.c vmdebug
+meta vmdebug.o %.c>%.o vmalloc/vmdebug.c vmdebug
 prev vmalloc/vmdebug.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmdebug.c
 done vmdebug.o generated
@@ -5462,7 +5461,7 @@
 make vmalloc/vmdisc.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmdisc.c
-meta vmdisc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmdisc.c vmdisc
+meta vmdisc.o %.c>%.o vmalloc/vmdisc.c vmdisc
 prev vmalloc/vmdisc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmdisc.c
 done vmdisc.o generated
@@ -5470,7 +5469,7 @@
 make vmalloc/vmexit.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmexit.c
-meta vmexit.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmexit.c vmexit
+meta vmexit.o %.c>%.o vmalloc/vmexit.c vmexit
 prev vmalloc/vmexit.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmexit.c
 done vmexit.o generated
@@ -5478,7 +5477,7 @@
 make vmalloc/vmlast.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmlast.c
-meta vmlast.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmlast.c vmlast
+meta vmlast.o %.c>%.o vmalloc/vmlast.c vmlast
 prev vmalloc/vmlast.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmlast.c
 done vmlast.o generated
@@ -5486,7 +5485,7 @@
 make vmalloc/vmopen.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmopen.c
-meta vmopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmopen.c vmopen
+meta vmopen.o %.c>%.o vmalloc/vmopen.c vmopen
 prev vmalloc/vmopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmopen.c
 done vmopen.o generated
@@ -5494,7 +5493,7 @@
 make vmalloc/vmpool.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmpool.c
-meta vmpool.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmpool.c vmpool
+meta vmpool.o %.c>%.o vmalloc/vmpool.c vmpool
 prev vmalloc/vmpool.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmpool.c
 done vmpool.o generated
@@ -5502,7 +5501,7 @@
 make vmalloc/vmprivate.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmprivate.c
-meta vmprivate.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmprivate.c 
vmprivate
+meta vmprivate.o %.c>%.o vmalloc/vmprivate.c vmprivate
 prev vmalloc/vmprivate.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmprivate.c
 done vmprivate.o generated
@@ -5510,7 +5509,7 @@
 make vmalloc/vmprofile.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmprofile.c
-meta vmprofile.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmprofile.c 
vmprofile
+meta vmprofile.o %.c>%.o vmalloc/vmprofile.c vmprofile
 prev vmalloc/vmprofile.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmprofile.c
 done vmprofile.o generated
@@ -5518,7 +5517,7 @@
 make vmalloc/vmregion.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmregion.c
-meta vmregion.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmregion.c 
vmregion
+meta vmregion.o %.c>%.o vmalloc/vmregion.c vmregion
 prev vmalloc/vmregion.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmregion.c
 done vmregion.o generated
@@ -5526,7 +5525,7 @@
 make vmalloc/vmsegment.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmsegment.c
-meta vmsegment.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmsegment.c 
vmsegment
+meta vmsegment.o %.c>%.o vmalloc/vmsegment.c vmsegment
 prev vmalloc/vmsegment.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmsegment.c
 done vmsegment.o generated
@@ -5534,7 +5533,7 @@
 make vmalloc/vmset.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmset.c
-meta vmset.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmset.c vmset
+meta vmset.o %.c>%.o vmalloc/vmset.c vmset
 prev vmalloc/vmset.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmset.c
 done vmset.o generated
@@ -5542,7 +5541,7 @@
 make vmalloc/vmstat.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmstat.c
-meta vmstat.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmstat.c vmstat
+meta vmstat.o %.c>%.o vmalloc/vmstat.c vmstat
 prev vmalloc/vmstat.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmstat.c
 done vmstat.o generated
@@ -5550,7 +5549,7 @@
 make vmalloc/vmstrdup.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmstrdup.c
-meta vmstrdup.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmstrdup.c 
vmstrdup
+meta vmstrdup.o %.c>%.o vmalloc/vmstrdup.c vmstrdup
 prev vmalloc/vmstrdup.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmstrdup.c
 done vmstrdup.o generated
@@ -5558,7 +5557,7 @@
 make vmalloc/vmtrace.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmtrace.c
-meta vmtrace.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmtrace.c vmtrace
+meta vmtrace.o %.c>%.o vmalloc/vmtrace.c vmtrace
 prev vmalloc/vmtrace.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmtrace.c
 done vmtrace.o generated
@@ -5566,7 +5565,7 @@
 make vmalloc/vmwalk.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmwalk.c
-meta vmwalk.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmwalk.c vmwalk
+meta vmwalk.o %.c>%.o vmalloc/vmwalk.c vmwalk
 prev vmalloc/vmwalk.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmwalk.c
 done vmwalk.o generated
@@ -5574,7 +5573,7 @@
 make vmalloc/vmmopen.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmmopen.c
-meta vmmopen.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmmopen.c vmmopen
+meta vmmopen.o %.c>%.o vmalloc/vmmopen.c vmmopen
 prev vmalloc/vmmopen.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmmopen.c
 done vmmopen.o generated
@@ -5585,7 +5584,7 @@
 prev std/stdio.h implicit
 prev vmalloc/vmhdr.h implicit
 done vmalloc/malloc.c
-meta malloc.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/malloc.c malloc
+meta malloc.o %.c>%.o vmalloc/malloc.c malloc
 prev vmalloc/malloc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/malloc.c
 done malloc.o generated
@@ -5593,21 +5592,21 @@
 make vmalloc/vmgetmem.c
 prev vmalloc/vmhdr.h implicit
 done vmalloc/vmgetmem.c
-meta vmgetmem.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/vmalloc/vmgetmem.c 
vmgetmem
+meta vmgetmem.o %.c>%.o vmalloc/vmgetmem.c vmgetmem
 prev vmalloc/vmgetmem.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Ivmalloc -Iinclude -Istd 
-D_PACKAGE_ast -c vmalloc/vmgetmem.c
 done vmgetmem.o generated
 make a64l.o
 make uwin/a64l.c
 make FEATURE/uwin implicit
-meta FEATURE/uwin features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libast/features/uwin uwin
+meta FEATURE/uwin features/%>FEATURE/% features/uwin uwin
 make features/uwin
 done features/uwin
 prev ast.req
 exec - iffe -v -X std -c '${CC} ${mam_cc_FLAGS} ${CCFLAGS}   ${LDFLAGS} '   
run features/uwin
 done FEATURE/uwin generated
 done uwin/a64l.c
-meta a64l.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/a64l.c a64l
+meta a64l.o %.c>%.o uwin/a64l.c a64l
 prev uwin/a64l.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  -c 
uwin/a64l.c
 done a64l.o generated
@@ -5617,7 +5616,7 @@
 done uwin/mathimpl.h dontcare
 prev FEATURE/uwin implicit
 done uwin/acosh.c
-meta acosh.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/acosh.c acosh
+meta acosh.o %.c>%.o uwin/acosh.c acosh
 prev uwin/acosh.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/acosh.c
 done acosh.o generated
@@ -5626,7 +5625,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/asinh.c
-meta asinh.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/asinh.c asinh
+meta asinh.o %.c>%.o uwin/asinh.c asinh
 prev uwin/asinh.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/asinh.c
 done asinh.o generated
@@ -5635,7 +5634,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/atanh.c
-meta atanh.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/atanh.c atanh
+meta atanh.o %.c>%.o uwin/atanh.c atanh
 prev uwin/atanh.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/atanh.c
 done atanh.o generated
@@ -5644,7 +5643,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/cbrt.c
-meta cbrt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/cbrt.c cbrt
+meta cbrt.o %.c>%.o uwin/cbrt.c cbrt
 prev uwin/cbrt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/cbrt.c
 done cbrt.o generated
@@ -5653,7 +5652,7 @@
 prev std/limits.h implicit
 prev std/stdio.h implicit
 done uwin/crypt.c
-meta crypt.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/crypt.c crypt
+meta crypt.o %.c>%.o uwin/crypt.c crypt
 prev uwin/crypt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iinclude -Istd  -c uwin/crypt.c
 done crypt.o generated
@@ -5664,7 +5663,7 @@
 done ieee_libm.h dontcare virtual
 prev FEATURE/uwin implicit
 done uwin/erf.c
-meta erf.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/erf.c erf
+meta erf.o %.c>%.o uwin/erf.c erf
 prev uwin/erf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/erf.c
 done erf.o generated
@@ -5675,7 +5674,7 @@
 prev include/ast.h implicit
 prev FEATURE/uwin implicit
 done uwin/err.c
-meta err.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/err.c err
+meta err.o %.c>%.o uwin/err.c err
 prev uwin/err.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c uwin/err.c
 done err.o generated
@@ -5684,7 +5683,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/exp.c
-meta exp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/exp.c exp
+meta exp.o %.c>%.o uwin/exp.c exp
 prev uwin/exp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/exp.c
 done exp.o generated
@@ -5693,7 +5692,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/exp__E.c
-meta exp__E.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/exp__E.c exp__E
+meta exp__E.o %.c>%.o uwin/exp__E.c exp__E
 prev uwin/exp__E.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/exp__E.c
 done exp__E.o generated
@@ -5702,7 +5701,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/expm1.c
-meta expm1.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/expm1.c expm1
+meta expm1.o %.c>%.o uwin/expm1.c expm1
 prev uwin/expm1.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/expm1.c
 done expm1.o generated
@@ -5711,7 +5710,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/gamma.c
-meta gamma.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/gamma.c gamma
+meta gamma.o %.c>%.o uwin/gamma.c gamma
 prev uwin/gamma.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/gamma.c
 done gamma.o generated
@@ -5720,7 +5719,7 @@
 prev include/ast.h implicit
 prev FEATURE/uwin implicit
 done uwin/getpass.c
-meta getpass.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/getpass.c getpass
+meta getpass.o %.c>%.o uwin/getpass.c getpass
 prev uwin/getpass.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c uwin/getpass.c
 done getpass.o generated
@@ -5729,7 +5728,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/lgamma.c
-meta lgamma.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/lgamma.c lgamma
+meta lgamma.o %.c>%.o uwin/lgamma.c lgamma
 prev uwin/lgamma.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/lgamma.c
 done lgamma.o generated
@@ -5738,7 +5737,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/log.c
-meta log.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/log.c log
+meta log.o %.c>%.o uwin/log.c log
 prev uwin/log.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/log.c
 done log.o generated
@@ -5747,7 +5746,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/log1p.c
-meta log1p.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/log1p.c log1p
+meta log1p.o %.c>%.o uwin/log1p.c log1p
 prev uwin/log1p.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/log1p.c
 done log1p.o generated
@@ -5756,7 +5755,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/log__L.c
-meta log__L.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/log__L.c log__L
+meta log__L.o %.c>%.o uwin/log__L.c log__L
 prev uwin/log__L.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/log__L.c
 done log__L.o generated
@@ -5764,7 +5763,7 @@
 make uwin/rand48.c
 prev FEATURE/uwin implicit
 done uwin/rand48.c
-meta rand48.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/rand48.c rand48
+meta rand48.o %.c>%.o uwin/rand48.c rand48
 prev uwin/rand48.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  -c 
uwin/rand48.c
 done rand48.o generated
@@ -5773,7 +5772,7 @@
 prev std/limits.h implicit
 prev FEATURE/uwin implicit
 done uwin/random.c
-meta random.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/random.c random
+meta random.o %.c>%.o uwin/random.c random
 prev uwin/random.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd  -c 
uwin/random.c
 done random.o generated
@@ -5792,7 +5791,7 @@
 done uwin/rlib.h dontcare
 prev FEATURE/uwin implicit
 done uwin/rcmd.c
-meta rcmd.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/rcmd.c rcmd
+meta rcmd.o %.c>%.o uwin/rcmd.c rcmd
 prev uwin/rcmd.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iuwin -Iinclude -Istd  -c 
uwin/rcmd.c
 done rcmd.o generated
@@ -5800,7 +5799,7 @@
 make uwin/rint.c
 prev FEATURE/uwin implicit
 done uwin/rint.c
-meta rint.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/rint.c rint
+meta rint.o %.c>%.o uwin/rint.c rint
 prev uwin/rint.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I.  -c uwin/rint.c
 done rint.o generated
@@ -5809,7 +5808,7 @@
 prev uwin/mathimpl.h implicit
 prev FEATURE/uwin implicit
 done uwin/support.c
-meta support.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/uwin/support.c support
+meta support.o %.c>%.o uwin/support.c support
 prev uwin/support.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Iuwin  -c uwin/support.c
 done support.o generated
@@ -5818,7 +5817,7 @@
 prev include/ast.h implicit
 prev include/sfio_t.h implicit
 done disc/sfstrtmp.c
-meta sfstrtmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/disc/sfstrtmp.c sfstrtmp
+meta sfstrtmp.o %.c>%.o disc/sfstrtmp.c sfstrtmp
 prev disc/sfstrtmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -D__OBSOLETE__=20050101 -c disc/sfstrtmp.c
 done sfstrtmp.o generated
@@ -5827,7 +5826,7 @@
 prev include/error.h implicit
 prev include/ast.h implicit
 done obsolete/spawn.c
-meta spawn.o %.c>%.o ${PACKAGEROOT}/src/lib/libast/obsolete/spawn.c spawn
+meta spawn.o %.c>%.o obsolete/spawn.c spawn
 prev obsolete/spawn.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -Icomp -Iinclude -Istd 
-D_PACKAGE_ast -c obsolete/spawn.c
 done spawn.o generated
diff -r -N -u ksh93_2006_05_30/src/lib/libast/RELEASE 
ksh93_2006_06_16/src/lib/libast/RELEASE
--- ksh93_2006_05_30/src/lib/libast/RELEASE     2006-05-18 16:41:48.000000000 
+0200
+++ ksh93_2006_06_16/src/lib/libast/RELEASE     2006-06-12 21:39:42.000000000 
+0200
@@ -1,3 +1,5 @@
+06-06-11 cdt/dtview.c: update from kpv
+06-05-31 sfio/sfhdr.h: fix _SFOPEN() typo
 06-05-09 comp/comf.sh: add native getconf -a names to the mix
 06-04-28 misc/optget.c: add solaris long option name compatibility
 06-03-09 string/strmatch.c: add REG_ADVANCE => REG_* flags
diff -r -N -u ksh93_2006_05_30/src/lib/libast/sfio/sfhdr.h 
ksh93_2006_06_16/src/lib/libast/sfio/sfhdr.h
--- ksh93_2006_05_30/src/lib/libast/sfio/sfhdr.h        2005-03-07 
16:01:22.000000000 +0100
+++ ksh93_2006_06_16/src/lib/libast/sfio/sfhdr.h        2006-06-01 
08:10:58.000000000 +0200
@@ -873,7 +873,7 @@
 #define _SFOPENWR(f)   ((f)->endw = ((f)->flags&(SF_MTSAFE|SF_LINE)) ? 
(f)->data : (f)->endb)
 #define _SFOPEN(f)     ((f)->mode == SF_READ  ? _SFOPENRD(f) : \
                         (f)->mode == SF_WRITE ? _SFOPENWR(f) : \
-                        ((f)->endr = (f)->endr = (f)->data) )
+                        ((f)->endw = (f)->endr = (f)->data) )
 #define SFOPEN(f,l)    (void)((l) ? 0 : \
                                ((f)->mode &= ~(SF_LOCK|SF_RC|SF_RV), 
_SFOPEN(f), 0) )
 
diff -r -N -u ksh93_2006_05_30/src/lib/libcmd/Mamfile 
ksh93_2006_06_16/src/lib/libcmd/Mamfile
--- ksh93_2006_05_30/src/lib/libcmd/Mamfile     2006-05-31 05:26:05.000000000 
+0200
+++ ksh93_2006_06_16/src/lib/libcmd/Mamfile     2006-06-16 11:08:14.000000000 
+0200
@@ -181,7 +181,7 @@
 done cat.c
 make chgrp.c
 make FEATURE/symlink implicit
-meta FEATURE/symlink features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libcmd/features/symlink symlink
+meta FEATURE/symlink features/%>FEATURE/% features/symlink symlink
 make features/symlink
 done features/symlink
 prev cmd.req
@@ -263,7 +263,7 @@
 done expr.c
 make fds.c
 make FEATURE/sockets implicit
-meta FEATURE/sockets features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libcmd/features/sockets sockets
+meta FEATURE/sockets features/%>FEATURE/% features/sockets sockets
 make features/sockets
 done features/sockets
 prev cmd.req
@@ -290,7 +290,7 @@
 prev ${PACKAGE_ast_INCLUDE}/stdio.h implicit
 prev ${PACKAGE_ast_INCLUDE}/stdio.h implicit
 make FEATURE/ids implicit
-meta FEATURE/ids features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libcmd/features/ids ids
+meta FEATURE/ids features/%>FEATURE/% features/ids ids
 make features/ids
 done features/ids
 prev cmd.req
@@ -370,7 +370,7 @@
 done tty.c
 make uname.c
 make FEATURE/utsname implicit
-meta FEATURE/utsname features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libcmd/features/utsname utsname
+meta FEATURE/utsname features/%>FEATURE/% features/utsname utsname
 make features/utsname
 done features/utsname
 prev cmd.req
@@ -424,241 +424,241 @@
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done cmdlib.h
 done cmdinit.c
-meta cmdinit.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/cmdinit.c cmdinit
+meta cmdinit.o %.c>%.o cmdinit.c cmdinit
 prev cmdinit.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_cmd -c cmdinit.c
 done cmdinit.o generated
 make cmdrecurse.o
 prev cmdrecurse.c
-meta cmdrecurse.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/cmdrecurse.c cmdrecurse
+meta cmdrecurse.o %.c>%.o cmdrecurse.c cmdrecurse
 prev cmdrecurse.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_cmd -c cmdrecurse.c
 done cmdrecurse.o generated
 make basename.o
 prev basename.c
-meta basename.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/basename.c basename
+meta basename.o %.c>%.o basename.c basename
 prev basename.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c basename.c
 done basename.o generated
 make cat.o
 prev cat.c
-meta cat.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/cat.c cat
+meta cat.o %.c>%.o cat.c cat
 prev cat.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -D_PACKAGE_ast -D_BLD_cmd -c cat.c
 done cat.o generated
 make chgrp.o
 prev chgrp.c
-meta chgrp.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/chgrp.c chgrp
+meta chgrp.o %.c>%.o chgrp.c chgrp
 prev chgrp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c chgrp.c
 done chgrp.o generated
 make chmod.o
 prev chmod.c
-meta chmod.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/chmod.c chmod
+meta chmod.o %.c>%.o chmod.c chmod
 prev chmod.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c chmod.c
 done chmod.o generated
 make chown.o
 prev chown.c
-meta chown.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/chown.c chown
+meta chown.o %.c>%.o chown.c chown
 prev chown.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_cmd -c chown.c
 done chown.o generated
 make cmp.o
 prev cmp.c
-meta cmp.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/cmp.c cmp
+meta cmp.o %.c>%.o cmp.c cmp
 prev cmp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c cmp.c
 done cmp.o generated
 make comm.o
 prev comm.c
-meta comm.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/comm.c comm
+meta comm.o %.c>%.o comm.c comm
 prev comm.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c comm.c
 done comm.o generated
 make cp.o
 prev cp.c
-meta cp.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/cp.c cp
+meta cp.o %.c>%.o cp.c cp
 prev cp.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c cp.c
 done cp.o generated
 make cut.o
 prev cut.c
-meta cut.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/cut.c cut
+meta cut.o %.c>%.o cut.c cut
 prev cut.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c cut.c
 done cut.o generated
 make dirname.o
 prev dirname.c
-meta dirname.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/dirname.c dirname
+meta dirname.o %.c>%.o dirname.c dirname
 prev dirname.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c dirname.c
 done dirname.o generated
 make date.o
 prev date.c
-meta date.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/date.c date
+meta date.o %.c>%.o date.c date
 prev date.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c date.c
 done date.o generated
 make expr.o
 prev expr.c
-meta expr.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/expr.c expr
+meta expr.o %.c>%.o expr.c expr
 prev expr.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_BLD_cmd -D_PACKAGE_ast 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c expr.c
 done expr.o generated
 make fds.o
 prev fds.c
-meta fds.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/fds.c fds
+meta fds.o %.c>%.o fds.c fds
 prev fds.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c fds.c
 done fds.o generated
 make fmt.o
 prev fmt.c
-meta fmt.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/fmt.c fmt
+meta fmt.o %.c>%.o fmt.c fmt
 prev fmt.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c fmt.c
 done fmt.o generated
 make fold.o
 prev fold.c
-meta fold.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/fold.c fold
+meta fold.o %.c>%.o fold.c fold
 prev fold.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c fold.c
 done fold.o generated
 make getconf.o
 prev getconf.c
-meta getconf.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/getconf.c getconf
+meta getconf.o %.c>%.o getconf.c getconf
 prev getconf.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c getconf.c
 done getconf.o generated
 make head.o
 prev head.c
-meta head.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/head.c head
+meta head.o %.c>%.o head.c head
 prev head.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c head.c
 done head.o generated
 make id.o
 prev id.c
-meta id.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/id.c id
+meta id.o %.c>%.o id.c id
 prev id.c
 exec - ${CC} ${mam_cc_FLAGS} ${-debug-symbols?1?${mam_cc_DEBUG} 
-D_BLD_DEBUG?${CCFLAGS.FORCE}?} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c id.c
 done id.o generated
 make join.o
 prev join.c
-meta join.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/join.c join
+meta join.o %.c>%.o join.c join
 prev join.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c join.c
 done join.o generated
 make ln.o
 prev ln.c
-meta ln.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/ln.c ln
+meta ln.o %.c>%.o ln.c ln
 prev ln.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_BLD_cmd -D_PACKAGE_ast -c ln.c
 done ln.o generated
 make logname.o
 prev logname.c
-meta logname.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/logname.c logname
+meta logname.o %.c>%.o logname.c logname
 prev logname.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c logname.c
 done logname.o generated
 make mkdir.o
 prev mkdir.c
-meta mkdir.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/mkdir.c mkdir
+meta mkdir.o %.c>%.o mkdir.c mkdir
 prev mkdir.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c mkdir.c
 done mkdir.o generated
 make mkfifo.o
 prev mkfifo.c
-meta mkfifo.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/mkfifo.c mkfifo
+meta mkfifo.o %.c>%.o mkfifo.c mkfifo
 prev mkfifo.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c mkfifo.c
 done mkfifo.o generated
 make mv.o
 prev mv.c
-meta mv.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/mv.c mv
+meta mv.o %.c>%.o mv.c mv
 prev mv.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_BLD_cmd -D_PACKAGE_ast -c mv.c
 done mv.o generated
 make paste.o
 prev paste.c
-meta paste.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/paste.c paste
+meta paste.o %.c>%.o paste.c paste
 prev paste.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c paste.c
 done paste.o generated
 make pathchk.o
 prev pathchk.c
-meta pathchk.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/pathchk.c pathchk
+meta pathchk.o %.c>%.o pathchk.c pathchk
 prev pathchk.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c pathchk.c
 done pathchk.o generated
 make rev.o
 prev rev.c
-meta rev.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/rev.c rev
+meta rev.o %.c>%.o rev.c rev
 prev rev.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c rev.c
 done rev.o generated
 make rm.o
 prev rm.c
-meta rm.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/rm.c rm
+meta rm.o %.c>%.o rm.c rm
 prev rm.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c rm.c
 done rm.o generated
 make rmdir.o
 prev rmdir.c
-meta rmdir.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/rmdir.c rmdir
+meta rmdir.o %.c>%.o rmdir.c rmdir
 prev rmdir.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c rmdir.c
 done rmdir.o generated
 make stty.o
 prev stty.c
-meta stty.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/stty.c stty
+meta stty.o %.c>%.o stty.c stty
 prev stty.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c stty.c
 done stty.o generated
 make tail.o
 prev tail.c
-meta tail.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/tail.c tail
+meta tail.o %.c>%.o tail.c tail
 prev tail.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c tail.c
 done tail.o generated
 make tee.o
 prev tee.c
-meta tee.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/tee.c tee
+meta tee.o %.c>%.o tee.c tee
 prev tee.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c tee.c
 done tee.o generated
 make tty.o
 prev tty.c
-meta tty.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/tty.c tty
+meta tty.o %.c>%.o tty.c tty
 prev tty.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c tty.c
 done tty.o generated
 make uname.o
 prev uname.c
-meta uname.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/uname.c uname
+meta uname.o %.c>%.o uname.c uname
 prev uname.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -DHOSTTYPE=\""${mam_cc_HOSTTYPE}"\" -D_PACKAGE_ast 
-D_BLD_cmd -DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c uname.c
 done uname.o generated
 make uniq.o
 prev uniq.c
-meta uniq.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/uniq.c uniq
+meta uniq.o %.c>%.o uniq.c uniq
 prev uniq.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c uniq.c
 done uniq.o generated
 make wc.o
 prev wc.c
-meta wc.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/wc.c wc
+meta wc.o %.c>%.o wc.c wc
 prev wc.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-DERROR_CATALOG=\""libcmd"\" -D_PACKAGE_ast -D_BLD_cmd 
-DUSAGE_LICENSE=\""[-author?Glenn Fowler <gsf at 
research.att.com>][-author?David Korn <dgk at 
research.att.com>][-copyright?Copyright (c) 1992-2006 AT&T Knowledge 
Ventures][-license?http://www.opensource.org/licenses/cpl1.0.txt][--catalog?libcmd]"\";
 -c wc.c
 done wc.o generated
 make revlib.o
 prev revlib.c
-meta revlib.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/revlib.c revlib
+meta revlib.o %.c>%.o revlib.c revlib
 prev revlib.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_cmd -c revlib.c
 done revlib.o generated
 make wclib.o
 prev wclib.c
-meta wclib.o %.c>%.o ${PACKAGEROOT}/src/lib/libcmd/wclib.c wclib
+meta wclib.o %.c>%.o wclib.c wclib
 prev wclib.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_cmd -c wclib.c
 done wclib.o generated
diff -r -N -u ksh93_2006_05_30/src/lib/libdll/Mamfile 
ksh93_2006_06_16/src/lib/libdll/Mamfile
--- ksh93_2006_05_30/src/lib/libdll/Mamfile     2006-05-31 05:26:07.000000000 
+0200
+++ ksh93_2006_06_16/src/lib/libdll/Mamfile     2006-06-16 11:08:18.000000000 
+0200
@@ -154,7 +154,7 @@
 done ${PACKAGE_ast_INCLUDE}/error.h
 make dlldefs.h implicit
 make FEATURE/dll
-meta FEATURE/dll features/%>FEATURE/% 
${PACKAGEROOT}/src/lib/libdll/features/dll dll
+meta FEATURE/dll features/%>FEATURE/% features/dll dll
 make features/dll
 done features/dll
 prev dll.req
@@ -165,7 +165,7 @@
 done dlldefs.h generated
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done dlfcn.c
-meta dlfcn.o %.c>%.o ${PACKAGEROOT}/src/lib/libdll/dlfcn.c dlfcn
+meta dlfcn.o %.c>%.o dlfcn.c dlfcn
 prev dlfcn.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_BLD_dll -D_PACKAGE_ast -c dlfcn.c
 done dlfcn.o generated
@@ -175,7 +175,7 @@
 prev dlldefs.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done dllfind.c
-meta dllfind.o %.c>%.o ${PACKAGEROOT}/src/lib/libdll/dllfind.c dllfind
+meta dllfind.o %.c>%.o dllfind.c dllfind
 prev dllfind.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_dll -c dllfind.c
 done dllfind.o generated
@@ -185,7 +185,7 @@
 prev dlldefs.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done dllplug.c
-meta dllplug.o %.c>%.o ${PACKAGEROOT}/src/lib/libdll/dllplug.c dllplug
+meta dllplug.o %.c>%.o dllplug.c dllplug
 prev dllplug.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_PACKAGE_ast -D_BLD_dll -c dllplug.c
 done dllplug.o generated
@@ -196,7 +196,7 @@
 prev dlldefs.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done dllnext.c
-meta dllnext.o %.c>%.o ${PACKAGEROOT}/src/lib/libdll/dllnext.c dllnext
+meta dllnext.o %.c>%.o dllnext.c dllnext
 prev dllnext.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_BLD_dll -D_PACKAGE_ast -c dllnext.c
 done dllnext.o generated
@@ -205,7 +205,7 @@
 prev dlldefs.h implicit
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done dlllook.c
-meta dlllook.o %.c>%.o ${PACKAGEROOT}/src/lib/libdll/dlllook.c dlllook
+meta dlllook.o %.c>%.o dlllook.c dlllook
 prev dlllook.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_BLD_dll -D_PACKAGE_ast -c dlllook.c
 done dlllook.o generated
@@ -224,7 +224,7 @@
 done ${PACKAGE_ast_INCLUDE}/cdt.h
 prev ${PACKAGE_ast_INCLUDE}/ast.h implicit
 done dllscan.c
-meta dllscan.o %.c>%.o ${PACKAGEROOT}/src/lib/libdll/dllscan.c dllscan
+meta dllscan.o %.c>%.o dllscan.c dllscan
 prev dllscan.c
 exec - ${CC} ${mam_cc_FLAGS} ${CCFLAGS} -I. -I${PACKAGE_ast_INCLUDE} 
-D_BLD_dll -D_PACKAGE_ast -c dllscan.c
 done dllscan.o generated

Reply via email to