Re: [Axiom-developer] postprop.lisp

[Gabriel Dos Reis]

"Page, Bill" <address@hidden> writes:

| Gaby,
| 
| Here are some simple patches to build-improvements required by
| some versions of awk. Of course you need also to rebuild the
| corresponding Makefile.in files.

Applied to build-improvements.

-- Gaby
src/
2006-10-26  Bill Page  <address@hidden>

        * Makefile.pamphlet ($(alg-stamp)): Don't append to
        $(builddir)/algebra/more-rules.mk.  Just overwrite it.
        * Makefile.in: Regenerate.

src/algebra/
2006-10-26  Bill Page  <address@hidden>

        * Makefile.pamphlet (${MID}/%.NRLIB/code.o): Fix tabs.
        (<<findSpadFiles>>): Don't escape dollar sign inside AWK expression.
        (<<findBootstrapFiles>>): Likewise.
        * Makefile.in: Regenerate.

*** src/Makefile.pamphlet       (revision 15150)
--- src/Makefile.pamphlet       (local)
*************** $(alg-stamp): $(share-stamp)
*** 221,227 ****
                    > $(INT)/algebra/findAlgebraFiles && \
        echo 30b running ${INT}/algebra/findAlgebraFiles && \
        (cd $(srcdir)/algebra && . $(INT)/algebra/findAlgebraFiles) \
!           >> $(builddir)/algebra/more-rules.mk
        cd algebra && ${ENV} ${MAKE}
  @
  
--- 221,227 ----
                    > $(INT)/algebra/findAlgebraFiles && \
        echo 30b running ${INT}/algebra/findAlgebraFiles && \
        (cd $(srcdir)/algebra && . $(INT)/algebra/findAlgebraFiles) \
!           > $(builddir)/algebra/more-rules.mk
        cd algebra && ${ENV} ${MAKE}
  @
  
*** src/algebra/Makefile.pamphlet       (revision 15150)
--- src/algebra/Makefile.pamphlet       (local)
*************** ${MID}/%.NRLIB/code.o: ${MID}/%.spad
*** 1635,1641 ****
        @ (cd ${MID} ; \
           if [ -z "${NOISE}" ] ; then \
            echo ")co $*.spad" | ${INTERPSYS}  ; \
!            else \
             echo ")co $*.spad" | ${INTERPSYS} >> ${TMP}/trace ; \
           fi )
  
--- 1635,1641 ----
        @ (cd ${MID} ; \
           if [ -z "${NOISE}" ] ; then \
            echo ")co $*.spad" | ${INTERPSYS}  ; \
!          else \
             echo ")co $*.spad" | ${INTERPSYS} >> ${TMP}/trace ; \
           fi )
  
*************** egrep '@<<(domain|package|category) .*>>
*** 1766,1774 ****
  awk -F: '{
    chunk=substr($2,3,length($2)-5);
    split(chunk,part," ");
!   spadfile="\${MID}/"part[2]".spad";
!   print spadfile": \$(srcdir)/"$1;
!   print "address@hidden -R\""chunk"\" \$(srcdir)/"$1">"spadfile;
    print "";
  }'
  
--- 1766,1774 ----
  awk -F: '{
    chunk=substr($2,3,length($2)-5);
    split(chunk,part," ");
!   spadfile="${MID}/"part[2]".spad";
!   print spadfile": $(srcdir)/"$1;
!   print "address@hidden -R\""chunk"\" $(srcdir)/"$1">"spadfile;
    print "";
  }'
  
*************** egrep '@<<.*BOOTSTRAP>>=' *.spad.pamphle
*** 1829,1837 ****
  awk -F: '{
    chunk=substr($2,3,length($2)-5);
    split(chunk,part," ");
!   lspfile="\${MID}/"part[1];
!   print lspfile": \$(srcdir)/"$1;
!   print "address@hidden -R\""chunk"\" \$(srcdir)/"$1">"lspfile;
    print "";
  }'
  
--- 1829,1837 ----
  awk -F: '{
    chunk=substr($2,3,length($2)-5);
    split(chunk,part," ");
!   lspfile="${MID}/"part[1];
!   print lspfile": $(srcdir)/"$1;
!   print "address@hidden -R\""chunk"\" $(srcdir)/"$1">"lspfile;
    print "";
  }'