diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-11-17 11:57:57 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-11-17 11:57:57 -0200 |
| commit | 02bb76c19acc6eadc9634b1ee59f5407825d4b2c (patch) | |
| tree | 0b5850dc139e3a9407fb80fe77b10e71493a6c2b /share | |
| parent | ca223571c8548fda2e6571daf497482d8d236362 (diff) | |
| download | templater-02bb76c19acc6eadc9634b1ee59f5407825d4b2c.tar.gz templater-02bb76c19acc6eadc9634b1ee59f5407825d4b2c.tar.bz2 | |
Makefile fixes
Diffstat (limited to 'share')
| -rw-r--r-- | share/templater/drupal8/files/Makefile.drupal8 | 14 | ||||
| -rw-r--r-- | share/templater/templater/files/Makefile | 1 |
2 files changed, 10 insertions, 5 deletions
diff --git a/share/templater/drupal8/files/Makefile.drupal8 b/share/templater/drupal8/files/Makefile.drupal8 index 55375a5..410635b 100644 --- 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 02c7af6..6527452 100644 --- 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.* |