This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via 23a62518ce16a0f45f1a48514dc6bf109fd9f1db (commit)
from e71cfb59dc9c72c356784e4cbc244009da20d2b1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=23a62518ce16a0f45f1a48514dc6bf109fd9f1db
commit 23a62518ce16a0f45f1a48514dc6bf109fd9f1db
Author: Roland Mas <[email protected]>
Date: Tue Jan 12 16:58:27 2021 +0100
Make installation more resilient
diff --git a/src/GNUmakefile b/src/GNUmakefile
index c96b79a..7ac32a5 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -94,9 +94,7 @@ install-db: install-base-dirs
> $(DESTDIR)$(sysconfdir)/cron.d/fusionforge-db; \
fi
-install-web: install-base-dirs
- $(CP_R) vendor www $(DESTDIR)$(pkgdatadir)/
- $(CP_R) --no-clobber etc/httpd.conf* $(DESTDIR)$(config_path)
+install-web-dirs: install-base-dirs
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/docman/
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/docman/review/
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/download/
@@ -104,6 +102,10 @@ install-web: install-base-dirs
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/forum/pending/
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/tracker/
$(INSTALL) -d -m 00700 $(DESTDIR)$(data_path)/rss/
+
+install-web: install-web-dirs
+ $(CP_R) vendor www $(DESTDIR)$(pkgdatadir)/
+ $(CP_R) --no-clobber etc/httpd.conf* $(DESTDIR)$(config_path)
$(CP_R) post-install.d/web $(DESTDIR)$(pkgdatadir)/post-install.d/
if [ ! -e $(DESTDIR)$(sysconfdir)/logrotate.d/fusionforge-web ]; then \
sed 's,@log_path@,$(log_path),g'
etc/logrotate.d/fusionforge-web \
@@ -191,7 +193,7 @@ uninstall:
# not relying on 'prefix' for post-install (for no-install/dev setups)
post_source_path:=$(shell forge_get_config source_path 2>/dev/null)
post_plugins_path:=$(shell forge_get_config plugins_path 2>/dev/null)
-post-install:
+post-install: install-web-dirs
$(post_source_path)/bin/post-install.sh
post-install-base: post-install-common post-install-db post-install-web
post-install-scm post-install-ftp
@@ -273,6 +275,6 @@ dist-src-release:
echo $(VERSION) > $(TAR_PREFIX)/src/VERSION # if using e.g. make dist
VERSION=5.3.50+20141027
tar cjf $(TAR_PREFIX).tar.bz2 $(TAR_PREFIX)/
rm -rf $(TAR_PREFIX)/
-
+
version:
@echo $(VERSION)
-----------------------------------------------------------------------
Summary of changes:
src/GNUmakefile | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
