Merge "Fix "make modules" script bug under Mac OS X."