From: Silvio Rhatto Date: Fri, 27 Oct 2017 12:51:09 +0000 (-0200) Subject: Do not mess with Makefiles X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=619cdf4206536ee1b67e0ddefe3ba4fc8a1cb9ec;p=templater.git Do not mess with Makefiles --- diff --git a/templater b/templater index 69c72b9..2fb612b 100755 --- a/templater +++ b/templater @@ -175,8 +175,10 @@ function templater_ikiwiki { if [ ! -e "Makefile" ]; then cp $DIRNAME/share/ikiwiki/Makefile . - elif ! grep -q ^wiki: Makefile; then - grep -v '^#' $DIRNAME/share/ikiwiki/Makefile >> Makefile + #elif ! grep -q ^wiki: Makefile; then + # grep -v '^#' $DIRNAME/share/ikiwiki/Makefile >> Makefile + else + cp $DIRNAME/share/ikiwiki/Makefile Makefile.ikiwiki fi if [ ! -d "templates" ]; then @@ -207,8 +209,10 @@ function templater_sphinx { if [ ! -e "Makefile" ]; then cp $DIRNAME/share/sphinx/Makefile . - elif ! grep -q sphinx Makefile; then - grep -v '^#' $DIRNAME/share/sphinx/Makefile >> Makefile + #elif ! grep -q sphinx Makefile; then + # grep -v '^#' $DIRNAME/share/sphinx/Makefile >> Makefile + else + cp $DIRNAME/share/ikiwiki/Makefile Makefile.sphinx fi if [ ! -d "_static" ]; then @@ -235,8 +239,10 @@ function templater_pelican { if [ ! -e "Makefile" ]; then cp $DIRNAME/share/pelican/Makefile . - elif ! grep -q pelican Makefile; then - grep -v '^#' $DIRNAME/share/pelican/Makefile >> Makefile + #elif ! grep -q pelican Makefile; then + # grep -v '^#' $DIRNAME/share/pelican/Makefile >> Makefile + else + cp $DIRNAME/share/ikiwiki/Makefile Makefile.pelican fi if [ ! -d "content" ]; then