Fixed a bug where the identifier merging algorithm would fail horribly on pre-merged...

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 551bd7368e66ef3a6ed69d9832f732931813f656..efcb4eb658cfce99be34fcc1481c3a14f5992d02 100644 (file)
--- a/makefile
+++ b/makefile
@@ -83,7 +83,7 @@ endif
 endif
 
 control: control.tmp
-       [[ -e control ]] && diff control control.tmp &>/dev/null || cp -af control.tmp control
+       [[ -e control ]] && diff control control.tmp &>/dev/null || cp -pRf control.tmp control
 
 $(deb): $(all) control
        rm -rf package
@@ -143,7 +143,7 @@ package: $(deb)
 test: $(deb)
        dpkg -i $(deb)
        if [[ -e target.cy ]]; then cycript -c target.cy && echo; fi
-       if [[ -e jquery.js ]]; then /usr/bin/time cycript -c jquery.js >jquery.cyc.js; gzip -9c jquery.cyc.js >jquery.cyc.js.gz; wc -c jquery.{mam,gcc,cyc,bak,yui}.js; wc -c jquery.{gcc,cyc,bak,mam,yui}.js.gz; fi
+       if [[ -e jquery.js ]]; then /usr/bin/time cycript -c jquery.js >jquery.cyc.js; gzip -9c jquery.cyc.js >jquery.cyc.js.gz; wc -c jquery.{mam,gcc,cyc,bak,yui}.js; wc -c jquery.{cyc,gcc,bak,mam,yui}.js.gz; fi
        if [[ -e test.cy ]]; then cycript test.cy; fi
 
 .PHONY: all clean extra package control.tmp