commit 8931e5b45cec43f264592a3368c0469af9a4cb99
parent c18d3ad6c4e3f44cb3d00852964cab092086b32f
Author: Emily Eisenberg <emily@khanacademy.org>
Date: Sat, 20 Jun 2015 12:22:04 -0700
Cleanup Makefile
Summary: Ensure that `make dist` is idempotent, and make sure comments
don't get printed out.
Test plan:
- `make dist`
- `make dist` again
- See that there's no `katex` directory in `dist/`
- See that no comments are printed out during `make dist`
Auditors: alpert
Diffstat:
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
@@ -2,7 +2,8 @@
build: setup lint build/katex.min.js build/katex.min.css contrib zip compress
dist: build
- cp --recursive build/katex dist
+ rm -rf dist/
+ cp --recursive build/katex/ dist/
# Export these variables for use in contrib Makefiles
export BUILDDIR = $(realpath build)
@@ -43,8 +44,8 @@ contrib: build/contrib
.PHONY: build/contrib
build/contrib:
mkdir -p build/contrib
- # Since everything in build/contrib is put in the built files, make sure
- # there's nothing in there we don't want.
+ @# Since everything in build/contrib is put in the built files, make sure
+ @# there's nothing in there we don't want.
rm -rf build/contrib/*
$(MAKE) -C contrib/auto-render