Skip to content

Commit 3abe896

Browse files
authored
Merge pull request #11109 from ben-albrecht/trailing-slashes-are-dangerous
Remove trailing slashes for consistent BSD/GNU cp GNU cp does not recognize trailing slashes, so this PR removes them to avoid inconsistent behavior across platforms. Prior to this PR, we were getting an inconsistency in the docs path: ``` # BSD (good) chapel/doc/html/builtins/*.chpl # GNU (bad) chapel/doc/html/builtins/internal/*.chpl ``` This resulted in an inconsistency between our docs built nightly (built on linux) vs. release docs (built on OS X). [Reviewed by @ronawho]
2 parents 0dc070c + a1d32a7 commit 3abe896

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: modules/Makefile

+5-5
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ documentation: $(SYS_CTYPES_MODULE_DOC)
164164
@echo "Copying generated module documentation to ${DOC}"
165165
mkdir -p ${DOC}/modules
166166
mkdir -p ${DOC}/builtins
167-
cp -rf ${MODULE_SPHINX}/source/modules/standard ${DOC}/modules/
168-
cp -rf ${MODULE_SPHINX}/source/modules/packages ${DOC}/modules/
169-
cp -rf ${MODULE_SPHINX}/source/modules/dists ${DOC}/modules/
170-
cp -rf ${MODULE_SPHINX}/source/modules/layouts ${DOC}/modules/
171-
cp -rf ${MODULE_SPHINX}/source/modules/internal/ ${DOC}/builtins/
167+
cp -rf ${MODULE_SPHINX}/source/modules/standard ${DOC}/modules
168+
cp -rf ${MODULE_SPHINX}/source/modules/packages ${DOC}/modules
169+
cp -rf ${MODULE_SPHINX}/source/modules/dists ${DOC}/modules
170+
cp -rf ${MODULE_SPHINX}/source/modules/layouts ${DOC}/modules
171+
cp -rf ${MODULE_SPHINX}/source/modules/internal/* ${DOC}/builtins
172172
@echo "Removing generated files and directories"
173173
rm -rf ./docs
174174
rm -rf ${MODULE_SPHINX}

0 commit comments

Comments
 (0)