projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix make syntax error in last commit
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
Makefile
diff --git
a/tools/htdocs/Makefile
b/tools/htdocs/Makefile
index
e73a87a
..
ea4ebef
100644
(file)
--- a/
tools/htdocs/Makefile
+++ b/
tools/htdocs/Makefile
@@
-29,18
+29,21
@@
all: ${MKWS_JS} $(DOCS)
docs: $(DOCS)
docs: $(DOCS)
-pz2api-check:
+pz2api-git-checkout:
+ @if ! test -e ${PZ2API_JS}; then \
+ ( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \
+ fi
+
+mkws-js ${MKWS_JS}: ${PZ2API_JS} mkws.js
@if ! test -e ${PZ2API_JS}; then \
echo "The pazpar2 JS file ${PZ2API_JS} does not exists."; \
echo "Did you checked out the source from the git repo?"; \
@if ! test -e ${PZ2API_JS}; then \
echo "The pazpar2 JS file ${PZ2API_JS} does not exists."; \
echo "Did you checked out the source from the git repo?"; \
- echo "( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} )"; \
+ echo "Please run: make pz2api-git-checkout"; \
exit 1; \
fi
exit 1; \
fi
-
-mkws-js ${MKWS_JS}: pz2api-check ${PZ2API_JS} mkws.js
( echo "/* created at: $$(date)"; \
echo " mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,') */"; \
( echo "/* created at: $$(date)"; \
echo " mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,') */"; \
- curl -sSf ${JQUERY_URL}; \
+ curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \
cat ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new
mv -f ${MKWS_JS}.new ${MKWS_JS}
cat ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new
mv -f ${MKWS_JS}.new ${MKWS_JS}