Drupal 8: Makefile: local overrides

diff --git a/share/templater/drupal8/files/Makefile b/share/templater/drupal8/files/Makefile
index 8c226bbcf29c416b09e2ce3cf07cabdf3c0266fa..f424f3e7f0bbc3e2a0356faf8719038f1125a697 100644 (file)
--- a/share/templater/drupal8/files/Makefile
+++ b/share/templater/drupal8/files/Makefile
@@ -3,16 +3,19 @@
 #
 
 # Parameters
-CORE      = 8
-PROJECT   = drupal
-ENV       = dev
-CONTAINER = kvmx # vagrant or even docker
-DATE      = $(shell date +%Y%m%d)
-CWD       = $(shell pwd)
-#DESTDIR  ?= vendor
-DESTDIR  ?= /var/www/data
-DRUPAL    = $(DESTDIR)/drupal-$(CORE)
-DRUSH     = drush -r $(DRUPAL) -l $(PROJECT)
+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
+DRUPAL     = $(DESTDIR)/drupal-$(CORE)
+DRUSH      = drush -r $(DRUPAL) -l $(PROJECT)
+
+# Include local customizations/overrides, which might be .gitignore'd
+# See https://www.gnu.org/software/make/manual/html_node/Include.html
+-include Makefile.local
 
 # Setup production environment
 production: submodules post_receive drush settings ownership
@@ -43,7 +46,6 @@ vagrant:
 
 # Setup the virtual machine using kvmx
 kvmx:
-       kvmx up
        kvmx provision
 
 # Old target

diff --git a/share/templater/drupal8/setup b/share/templater/drupal8/setup
index 1fbaa0745172ffaf49c9b90960f838e90f2c8eea..470bae12ad997575f96f22e9da37c3688cc4b46f 100755 (executable)
--- a/share/templater/drupal8/setup
+++ b/share/templater/drupal8/setup
@@ -22,6 +22,10 @@ function templater_drupal8 {
       echo sql               >> .gitignore
     fi
 
+    if ! grep -q "^Makefile.local" .gitignore; then
+      echo Makefile.local >> .gitignore
+    fi
+
     if [ ! -e "settings.dev.php" ]; then
       cp $SHARE/drupal8/files/default.settings.php settings.dev.php
       #cp $SHARE/drupal8/files/default.settings.php .