]> gitweb.fluxo.info Git - templater.git/commitdiff
Do not mess with Makefiles
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 27 Oct 2017 12:51:09 +0000 (10:51 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 27 Oct 2017 12:51:09 +0000 (10:51 -0200)
templater

index 69c72b91fef9e49a6d7127f2636b469a09200be2..2fb612b47d178abef99249204bcdc25929617337 100755 (executable)
--- 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