Skip to content
This repository
Browse code

Coq_makefile: Better rule for subdirs when the subdir does not exist

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16056 85f007b7-540e-0410-9357-904b9bb8a0f7
  • Loading branch information...
commit 6416f0d41e46aaa64af50aa20dfb324db242286a 1 parent bf4b673
Pierre Boutillier authored December 10, 2012

Showing 1 changed file with 5 additions and 5 deletions. Show diff stats Hide diff stats

  1. 10  tools/coq_makefile.ml
10  tools/coq_makefile.ml
@@ -249,7 +249,7 @@ let install (vfiles,(mlifiles,ml4files,mlfiles,mllibfiles,mlpackfiles),_,sds) in
249 249
     install_include_by_root where_what_oth;
250 250
     List.iter
251 251
       (fun x ->
252  
-	printf "\t(cd %s; $(MAKE) DSTROOT=$(DSTROOT) INSTALLDEFAULTROOT=$(INSTALLDEFAULTROOT)/%s install)\n" x x)
  252
+	printf "\t+cd %s && $(MAKE) DSTROOT=$(DSTROOT) INSTALLDEFAULTROOT=$(INSTALLDEFAULTROOT)/%s install\n" x x)
253 253
       sds;
254 254
     print "\n";
255 255
     let install_one_kind kind dir =
@@ -284,7 +284,7 @@ let make_makefile sds =
284 284
     print "\tmv -f $@ $@.bak\n";
285 285
     print "\t$(COQBIN)coq_makefile -f $< -o $@\n\n";
286 286
     List.iter
287  
-      (fun x -> print "\t(cd "; print x; print " ; $(MAKE) Makefile)\n")
  287
+      (fun x -> print "\t+cd "; print x; print " && $(MAKE) Makefile\n")
288 288
       sds;
289 289
     print "\n";
290 290
   end
@@ -306,13 +306,13 @@ let clean sds sps =
306 306
 	 (print "\t- rm -rf "; print file; print "\n"))
307 307
     sps;
308 308
   List.iter
309  
-    (fun x -> print "\t(cd "; print x; print " ; $(MAKE) clean)\n")
  309
+    (fun x -> print "\t+cd "; print x; print " && $(MAKE) clean\n")
310 310
     sds;
311 311
   print "\n";
312 312
   print "archclean:\n";
313 313
   print "\trm -f *.cmx *.o\n";
314 314
   List.iter
315  
-    (fun x -> print "\t(cd "; print x; print " ; $(MAKE) archclean)\n")
  315
+    (fun x -> print "\t+cd "; print x; print " && $(MAKE) archclean\n")
316 316
     sds;
317 317
   print "\n";
318 318
   print "printenv:\n\t@$(COQBIN)coqtop -config\n";
@@ -492,7 +492,7 @@ let custom sps =
492 492
 
493 493
 let subdirs sds =
494 494
   let pr_subdir s =
495  
-    print s; print ":\n\tcd "; print s; print " ; $(MAKE) all\n\n"
  495
+    print s; print ":\n\t+cd \""; print s; print "\" && $(MAKE) all\n\n"
496 496
   in
497 497
     if sds <> [] then section "Subdirectories.";
498 498
     List.iter pr_subdir sds

0 notes on commit 6416f0d

Please sign in to comment.
Something went wrong with that request. Please try again.