Merge branch documentation-fixups into next

lukego · May 28, 2015 · e1af61d · e1af61d
2 parents 554de84 + 4b0c56a
commit e1af61d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ obj
 /src/syscall.lua
 /src/syscall
 /deps/*.vsn
+/src/program/programs.inc
diff --git a/src/Makefile b/src/Makefile
@@ -193,7 +193,7 @@ $(INCOBJ): obj/%_inc.o: %.inc Makefile program/programs.inc | $(OBJDIR)
 program/programs.inc:
 	@(for d in program/*/; do basename $$d; done) > $@
 
-.FORCE: program/programs.inc
+FORCE:
 
 # extra/ third party bits and pieces
 obj/strict.o: extra/strict.lua | $(OBJDIR)

diff --git a/src/core/main.lua b/src/core/main.lua
@@ -59,7 +59,7 @@ end
 
 function usage ()
    print("Usage: "..ffi.string(C.argv[0]).." <program> ...")
-   local programs = require("program.programs_inc"):gsub("[a-z]+", "  %1")
+   local programs = require("program.programs_inc"):gsub("%S+", "  %1")
    print()
    print("This snabb executable has the following programs built in:")
    print(programs)