@@ -860,6 +860,7 @@ function os::build::gen-man() {

   local cmd="$1"

   local dest="$2"

   local cmdName="$3"

+  local filestore=".files_generated_$3"

   local skipprefix="${4:-}"

   # We do this in a tmpdir in case the dest has other non-autogenned files

@@ -869,7 +870,7 @@ function os::build::gen-man() {

   # generate the new files

   ${cmd} "${tmpdir}" "${cmdName}"

   # create the list of generated files

-  ls "${tmpdir}" | LC_ALL=C sort > "${tmpdir}/.files_generated"

+  ls "${tmpdir}" | LC_ALL=C sort > "${tmpdir}/${filestore}"

   # remove all old generated file from the destination

   while read file; do

@@ -884,7 +885,7 @@ function os::build::gen-man() {

     else

       rm "${dest}/${file}" || true

     fi

-  done <"${dest}/.files_generated"

+  done <"${dest}/${filestore}"

   # put the new generated file into the destination

   find "${tmpdir}" -exec rsync -pt {} "${dest}" \; >/dev/null

@@ -37,14 +37,16 @@ fi

 OUTPUT_DIR_REL=${1:-""}

 OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/generated"

-MAN_OC_OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/man/oc"

-MAN_OPENSHIFT_OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/man/openshift"

-MAN_OADM_OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/man/oadm"

+MAN_OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/man/man1"

+# MAN_OC_OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/man/oc"

+# MAN_OPENSHIFT_OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/man/openshift"

+# MAN_OADM_OUTPUT_DIR="${OS_ROOT}/${OUTPUT_DIR_REL}/docs/man/oadm"

 mkdir -p "${OUTPUT_DIR}" || echo $? > /dev/null

-mkdir -p "${MAN_OC_OUTPUT_DIR}" || echo $? > /dev/null

-mkdir -p "${MAN_OPENSHIFT_OUTPUT_DIR}" || echo $? > /dev/null

-mkdir -p "${MAN_OADM_OUTPUT_DIR}" || echo $? > /dev/null

+mkdir -p "${MAN_OUTPUT_DIR}" || echo $? > /dev/null

+# mkdir -p "${MAN_OC_OUTPUT_DIR}" || echo $? > /dev/null

+# mkdir -p "${MAN_OPENSHIFT_OUTPUT_DIR}" || echo $? > /dev/null

+# mkdir -p "${MAN_OADM_OUTPUT_DIR}" || echo $? > /dev/null

 os::build::gen-docs "${gendocs}" "${OUTPUT_DIR}"

-os::build::gen-man "${genman}" "${MAN_OC_OUTPUT_DIR}" "oc"

-os::build::gen-man "${genman}" "${MAN_OPENSHIFT_OUTPUT_DIR}" "openshift"

-os::build::gen-man "${genman}" "${MAN_OADM_OUTPUT_DIR}" "oadm"

+os::build::gen-man "${genman}" "${MAN_OUTPUT_DIR}" "oc"

+os::build::gen-man "${genman}" "${MAN_OUTPUT_DIR}" "openshift"

+os::build::gen-man "${genman}" "${MAN_OUTPUT_DIR}" "oadm"

\ No newline at end of file

@@ -16,7 +16,7 @@ GENERATED_DOCS_ROOT="${OS_ROOT}/${GENERATED_DOCS_ROOT_REL}"

 TMP_GENERATED_DOCS_ROOT_REL="_output/verify-generated-docs"

 TMP_GENERATED_DOCS_ROOT="${OS_ROOT}/${TMP_GENERATED_DOCS_ROOT_REL}/${GENERATED_DOCS_ROOT_REL}"

-GENERATED_DOCS_MAN_ROOT_REL="docs/man"

+GENERATED_DOCS_MAN_ROOT_REL="docs/man/man1"

 GENERATED_DOCS_MAN_ROOT="${OS_ROOT}/${GENERATED_DOCS_MAN_ROOT_REL}"

 TMP_GENERATED_DOCS_MAN_ROOT="${OS_ROOT}/${TMP_GENERATED_DOCS_ROOT_REL}/${GENERATED_DOCS_MAN_ROOT_REL}"