diff options
| author | root <root@krebs> | 2011-09-01 02:18:42 +0200 |
|---|---|---|
| committer | root <root@krebs> | 2011-09-01 02:18:42 +0200 |
| commit | bb2a234ba756eb600fb6f562e67500d511d4ab39 (patch) | |
| tree | c89b205e3ad2d20e3aa80ca525e0bbf1e01b4670 /retiolum/Makefile | |
| parent | 8a6fd84c70618f5a435d2859b513de6de68dc0d1 (diff) | |
| parent | 4fb37da707279faf92cc8a054c646336f23dfdbe (diff) | |
Merge branch 'master' of github.com:/krebscode/painload
Conflicts:
.gitmodules
oncology/dpfhack_display
Diffstat (limited to 'retiolum/Makefile')
| -rw-r--r-- | retiolum/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/retiolum/Makefile b/retiolum/Makefile index 407d8c60..c80a6faa 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -8,9 +8,10 @@ links: for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done hosts: - bin/update-retiolum-hosts + bin/update-retiolum-hosts || true install: update + @#punani -Ei tinc python @# will not run automatically scripts/tinc_setup/install.sh scripts/autostart/create-startup.sh @@ -18,10 +19,10 @@ install: update update: hosts @echo creating Magic bin/update_tinc_hosts "create magic" || true - @echo adding hosts + @echo adding hosts bin/update_tinc_hosts restart arch-install: update install arch-autostart autohosts arch-autostart: - make -C scripts/autostart arch + make -C scripts/autostart arch || true |