Makefile fixes

diff --git a/share/templater/drupal8/files/Makefile.drupal8 b/share/templater/drupal8/files/Makefile.drupal8
index 55375a5a64447e56a927c6fd93991076f94b7489..410635b4a6c0fcbc6f8bb5347c5157f44ded0411 100644 (file)
--- a/share/templater/drupal8/files/Makefile.drupal8
+++ b/share/templater/drupal8/files/Makefile.drupal8
@@ -6,13 +6,17 @@
 CORE       = 8
 PROJECT    = drupal
 ENV       ?= dev
-CONTAINER  = kvmx # vagrant or even docker
 DATE       = $(shell date +%Y%m%d)
 CWD        = $(shell pwd)
-DESTDIR   ?= /var/www/data # vendor
+DESTDIR   ?= /var/www/data
 DRUPAL     = $(DESTDIR)/drupal-$(CORE)
 DRUSH      = drush -r $(DRUPAL) -l $(PROJECT)
 
+# Customization examples
+#CONTAINER  = vagrant
+#CONTAINER  = docker
+#DESTDIR   ?= vendor
+
 # Include local customizations/overrides, which might be .gitignore'd
 # See https://www.gnu.org/software/make/manual/html_node/Include.html
 #-include Makefile.local
@@ -177,9 +181,9 @@ upgrade-drupal:
        BASE=$(DESTDIR) drupal upgrade $(CORE)
 
 # Configure update hook on remote host
-post_receive:
-       git config receive.denyCurrentBranch ignore
-       cd .git/hooks && ln -sf ../../bin/post-receive
+#post_receive:
+#      git config receive.denyCurrentBranch ignore
+#      cd .git/hooks && ln -sf ../../bin/post-receive
 
 # Pull changes
 pull:

diff --git a/share/templater/templater/files/Makefile b/share/templater/templater/files/Makefile
index 02c7af639b0f1a388675764330bc6583421a2ae2..6527452a9c13237e057b3d7b0988512810c1bf6d 100644 (file)
--- a/share/templater/templater/files/Makefile
+++ b/share/templater/templater/files/Makefile
@@ -14,6 +14,7 @@ serve:
        #php -S localhost:8000
 
 post_receive:
+       git config receive.denyCurrentBranch ignore
        test -s bin/post-receive && cd .git/hooks && ln -sf ../../bin/post-receive
 
 # Process any other Makefile whose filename matches Makefile.*