Ticket #15394: acl2.diff

Portfile

@@ -47 +47 @@
                 workshops.tar.gz md5 218a53abcbb53bac3c286c28df9ee0ad \
                 nonstd.tar.gz    md5 58b6f12ec3b68cf6c0ba30b8bd040d4b
 
-post-extract    { cd ${workpath}
-                  file rename ${name}-sources ${name}-${version}
-                  file rename workshops ${name}-${version}/books
-                  file rename nonstd    ${name}-${version}/books
+post-extract    {
+                  file rename ${workpath}/${name}-sources ${workpath}/${name}-${version}
+                  file rename ${workpath}/workshops ${workpath}/${name}-${version}/books
+                  file rename ${workpath}/nonstd    ${workpath}/${name}-${version}/books
                 }
 
 use_configure   no
@@ -79 +79 @@
 variant nonstd     { }
 
 build           { if {[variant_isset openmcl]} {
-                         cd ${worksrcpath}
-                         system "make large LISP=openmcl"
+                         system "cd ${worksrcpath} && make large LISP=openmcl"
                          if {[variant_isset nonstd]} {
-                                 system "make large-acl2r LISP=openmcl"
+                                 system "cd ${worksrcpath} && make large-acl2r LISP=openmcl"
                          }
                   } else {
-                         cd ${worksrcpath}
-                         system "make large LISP=sbcl"
+                         system "cd ${worksrcpath} && make large LISP=sbcl"
                          if {[variant_isset nonstd]} {
                                  system "make large-acl2r LISP=sbcl"
                          }
@@ -145 +143 @@
 
 
                   if {[variant_isset certify]} { 
-                        cd ${destroot}/${target_path}
                         set clogfile ${destroot}${prefix}/share/${name}/${version}/certify-books.log
                         ui_msg "certify-books log will be in ${clogfile}"
-                        system "make clean-books"
-                        system "make certify-books > ${clogfile} 2>&1"
+                        system "cd ${destroot}/${target_path} && make clean-books"
+                        system "cd ${destroot}/${target_path} && make certify-books > ${clogfile} 2>&1"
                   }
 
                   if {[variant_isset regression]} {
-                        cd ${destroot}/${target_path}
                         set rlogfile ${destroot}${prefix}/share/${name}/${version}/regression.log
                         ui_msg "regression log will be in ${rlogfile}"
-                        system "make clean-books"
-                        system "make regression > ${rlogfile} 2>&1"
+                        system "cd ${destroot}/${target_path} && make clean-books"
+                        system "cd ${destroot}/${target_path} && make regression > ${rlogfile} 2>&1"
 
                         if {[variant_isset nonstd]} {
                                 set rlogfile_nonstd ${destroot}${prefix}/share/${name}/${version}/regression-nonstd.log
                                 ui_msg "regression-nonstd log will be in ${rlogfile_nonstd}"
-                                system "make ACL2=${destroot}${prefix}/share/${name}/${version}/saved_acl2r regression-nonstd > ${rlogfile_nonstd} 2>&1"
+                                system "cd ${destroot}/${target_path} && make ACL2=${destroot}${prefix}/share/${name}/${version}/saved_acl2r regression-nonstd > ${rlogfile_nonstd} 2>&1"
                         }
                   }