X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=19418dbd5ad1137b0bb6566653aacdc42db8ecc7;hb=be9221212eade180e78a3566797f97a9e6178625;hp=02d4ada7e314b04e345a4893e19e7e624c8b907c;hpb=27d4b7221fafd480e9532e14c65c865f964f39ab;p=unfold.git diff --git a/Makefile b/Makefile index 02d4ada7..19418dbd 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ force: #################### compute emacs tags # list files under git but exclude third-party stuff like bootstrap and jquery myfiles: force - @git ls-files | egrep -v 'insert_above/|/bootstrap/|/jquery/' + @git ls-files | egrep -v 'insert_above/|/bootstrap/|/jquery/|datatables/' # in general it's right to rely on the contents as reported by git tags: force @@ -31,8 +31,9 @@ SSHURL:=root@$(MYSLICEBOX):/ SSHCOMMAND:=ssh root@$(MYSLICEBOX) ### rsync options -# the config file should probably not be overridden -LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' --exclude settings.py --exclude devel +# the config file should probably not be overridden ?? +# --exclude settings.py +LOCAL_RSYNC_EXCLUDES := --exclude '*.pyc' --exclude devel --exclude DataTables-1.9.4 # usual excludes RSYNC_EXCLUDES := --exclude .git --exclude '*~' --exclude TAGS --exclude .DS_Store $(LOCAL_RSYNC_EXCLUDES) # make -n will propagate as rsync -n @@ -41,7 +42,8 @@ RSYNC_COND_DRY_RUN := $(if $(findstring n,$(MAKEFLAGS)),--dry-run,) RSYNC := rsync -a -v $(RSYNC_COND_DRY_RUN) $(RSYNC_EXCLUDES) # xxx until we come up with a packaging this is going to be a wild guess -INSTALLED=/usr/share/myslice +#INSTALLED=/usr/share/myslice +INSTALLED=/root/myslice sync: ifeq (,$(MYSLICEBOX)) @@ -59,5 +61,5 @@ ifeq (,$(MYSLICEBOX)) @echo " $(MAKE) MYSLICEBOX=debian04.pl.sophia.inria.fr "$@"" @exit 1 else - @echo "$@" target not yet implemented; exit; @$(SSHCOMMAND) /etc/init.d/apache2 restart + @echo "$@" target not yet implemented - for an apache based depl it would read ...; exit; @$(SSHCOMMAND) /etc/init.d/apache2 restart endif