X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=388a4b823c866ef0eb2f3f001f1ef85e9569fcb6;hb=9720875f8d72063a5b845c1ee4a3ec83e2f2b1a8;hp=82d4e7e8277e3eec9affa70c3b7f2a786f43e2f8;hpb=6365bcfbbe68f6d79baa3e95a7904af5541326f0;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 82d4e7e..388a4b8 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -24,19 +24,7 @@ COMPONENTS = ${SRC}/mkws-handlebars.js \
 GENERATED = ${HANDLEBARS_FILE} ${JQUERY_FILE} ${JQUERY_JSON_FILE} ${PP2_FILE} \
 	mkws.js mkws.min.js mkws-complete.js mkws-complete.min.js
 
-INSTALLABLE = ${SRC}/mkws-jquery.js VERSION NEWS $(GENERATED)
-
-INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
-
-**make-default**: mkws.js
-
-install: $(INSTALLED)
-
-uninstall:
-	rm -f $(INSTALLED)
-
-../tools/htdocs/%: %
-	rm -f $@ && cp -p $? $@ && chmod 444 $@
+**make-default**: all
 
 all: mkws.min.js mkws-complete.min.js
 
@@ -55,12 +43,12 @@ mkws-js mkws-complete.js: Makefile mkws.js ${SRC}/mkws-jquery.js ${HANDLEBARS_FI
 	  cat ${PP2_FILE}; \
 	  cat  mkws.js; \
 	  cat  ${SRC}/mkws-jquery.js; \
-	) > mkws-complete.js.new
-	mv -f mkws-complete.js.new mkws-complete.js
+	) > mkws-complete.js.tmp
+	mv -f mkws-complete.js.tmp mkws-complete.js
 
 %.min.js: %.js
-	yui-compressor $? > $@.new
-	mv -f $@.new $@
+	yui-compressor $? > $@.tmp
+	mv -f $@.tmp $@
 
 mkws-syntax-check:
 	yui-compressor mkws.js >/dev/null
@@ -70,9 +58,9 @@ ${HANDLEBARS_FILE}:
 	mv -f $@.tmp $@
 
 ${JQUERY_FILE}:
-	curl -sSf ${JQUERY_URL} -o $@.new
-	perl -npe 's,sourceMappingURL=jquery.*map,,' $@.new > $@
-	rm -f $@.new
+	curl -sSf ${JQUERY_URL} -o $@.tmp
+	perl -npe 's,sourceMappingURL=jquery.*map,,' $@.tmp > $@
+	rm -f $@.tmp
 
 ${JQUERY_JSON_FILE}:
 	curl -sSf ${JQUERY_JSON_URL} -o $@.tmp
@@ -95,11 +83,12 @@ release: mkws.js mkws-complete.js mkws.min.js mkws-complete.min.js
 
 mkws.js: $(COMPONENTS) Makefile
 	rm -f $@
-	cat ${COMPONENTS} > $@
+	cat ${COMPONENTS} > $@.tmp
+	mv -f $@.tmp $@
 	chmod 444 $@
 
 distclean: clean
-	rm -f *.orig *.bak *.rej
+	@echo "(No need for distclean, 'make clean' is fine)"
 
 clean:
 	rm -f ${GENERATED}