packages/net/seafile-seahub/patches/020-Makefile-fixes.patch

--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+PYTHON ?= python
+DJANGO_ADMIN_PY ?= django-admin.py
+
 PROJECT=seahub
 
 develop: setup-git
@@ -9,7 +12,7 @@ dist: locale uglify statici18n collectstatic
 
 locale:
 	@echo "--> Compile locales"
-	django-admin.py compilemessages
+	$(DJANGO_ADMIN_PY) compilemessages
 	@echo ""
 
 uglify:
@@ -19,17 +22,17 @@ uglify:
 
 statici18n:
 	@echo "--> Generate JS locale files in static/scripts/i18n"
-	python manage.py compilejsi18n
+	$(PYTHON) manage.py compilejsi18n
 
 collectstatic:
 	@echo "--> Collect django static files to media/assets"
 	rm -rf media/assets 2> /dev/null
-	python manage.py collectstatic --noinput -i admin -i termsandconditions -i app -i sysadmin-app -i build.js
+	$(PYTHON) manage.py collectstatic --noinput -i admin -i termsandconditions -i app -i sysadmin-app -i build.js
 
 compressstatic:
 	@echo "--> Compress static files(css) to media/CACHE"
 	rm -rf media/CACHE 2> /dev/null
-	python manage.py compress
+	$(PYTHON) manage.py compress
 
 clean:
 	@echo '--> Cleaning media/static cache & dist'
seafile-seahub: bump to 6.3.0 Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> 2018-06-06 21:34:16 +00:00			`--- a/Makefile`
			`+++ b/Makefile`
seafile: import version 5.1.1 and its dependencies Signed-off-by: Gergely Kiss <mail.gery@gmail.com> 2016-04-30 08:37:30 +00:00			`@@ -1,3 +1,6 @@`
seafile-seahub: de-couple build a bit more seafile-seahub's build is a mess. It hijacks some OpenWrt mk files into the build. This can be avoided by provided some of the required parameters via env-vars and patching the env-vars into the build. Which is what this patch does. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com> (cherry-picked from commit cf9975544476fc268432fcb24b07707b4f5ba39a) 2019-06-03 12:17:23 +00:00			`+PYTHON ?= python`
			`+DJANGO_ADMIN_PY ?= django-admin.py`
seafile: import version 5.1.1 and its dependencies Signed-off-by: Gergely Kiss <mail.gery@gmail.com> 2016-04-30 08:37:30 +00:00			`+`
			`PROJECT=seahub`

			`develop: setup-git`
seafile-seahub: Update to 6.3.4 Switch to codeload for simplicity and easier package bumping. Added dependency on pytz on build time as django-admin requires it. Signed-off-by: Rosen Penev <rosenp@gmail.com> 2018-10-26 03:23:04 +00:00			`@@ -9,7 +12,7 @@ dist: locale uglify statici18n collectstatic`
seafile: import version 5.1.1 and its dependencies Signed-off-by: Gergely Kiss <mail.gery@gmail.com> 2016-04-30 08:37:30 +00:00
			`locale:`
			`@echo "--> Compile locales"`
seafile-seahub: bump to 6.3.0 Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> 2018-06-06 21:34:16 +00:00			`- django-admin.py compilemessages`
seafile-seahub: de-couple build a bit more seafile-seahub's build is a mess. It hijacks some OpenWrt mk files into the build. This can be avoided by provided some of the required parameters via env-vars and patching the env-vars into the build. Which is what this patch does. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com> (cherry-picked from commit cf9975544476fc268432fcb24b07707b4f5ba39a) 2019-06-03 12:17:23 +00:00			`+ $(DJANGO_ADMIN_PY) compilemessages`
seafile: import version 5.1.1 and its dependencies Signed-off-by: Gergely Kiss <mail.gery@gmail.com> 2016-04-30 08:37:30 +00:00			`@echo ""`

			`uglify:`
seafile-seahub: bump to 6.3.0 Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com> 2018-06-06 21:34:16 +00:00			`@@ -19,17 +22,17 @@ uglify:`
seafile: import version 5.1.1 and its dependencies Signed-off-by: Gergely Kiss <mail.gery@gmail.com> 2016-04-30 08:37:30 +00:00
			`statici18n:`
			`@echo "--> Generate JS locale files in static/scripts/i18n"`
			`- python manage.py compilejsi18n`
seafile-seahub: de-couple build a bit more seafile-seahub's build is a mess. It hijacks some OpenWrt mk files into the build. This can be avoided by provided some of the required parameters via env-vars and patching the env-vars into the build. Which is what this patch does. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com> (cherry-picked from commit cf9975544476fc268432fcb24b07707b4f5ba39a) 2019-06-03 12:17:23 +00:00			`+ $(PYTHON) manage.py compilejsi18n`
seafile: import version 5.1.1 and its dependencies Signed-off-by: Gergely Kiss <mail.gery@gmail.com> 2016-04-30 08:37:30 +00:00
			`collectstatic:`
			`@echo "--> Collect django static files to media/assets"`
seafile: upgrade to 6.2.2 Signed-off-by: Gergely Kiss <mail.gery@gmail.com> 2017-10-22 21:43:09 +00:00			`rm -rf media/assets 2> /dev/null`
seafile-seahub: Update to 6.3.4 Switch to codeload for simplicity and easier package bumping. Added dependency on pytz on build time as django-admin requires it. Signed-off-by: Rosen Penev <rosenp@gmail.com> 2018-10-26 03:23:04 +00:00			`- python manage.py collectstatic --noinput -i admin -i termsandconditions -i app -i sysadmin-app -i build.js`
seafile-seahub: de-couple build a bit more seafile-seahub's build is a mess. It hijacks some OpenWrt mk files into the build. This can be avoided by provided some of the required parameters via env-vars and patching the env-vars into the build. Which is what this patch does. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com> (cherry-picked from commit cf9975544476fc268432fcb24b07707b4f5ba39a) 2019-06-03 12:17:23 +00:00			`+ $(PYTHON) manage.py collectstatic --noinput -i admin -i termsandconditions -i app -i sysadmin-app -i build.js`
seafile: upgrade to 6.2.2 Signed-off-by: Gergely Kiss <mail.gery@gmail.com> 2017-10-22 21:43:09 +00:00
			`compressstatic:`
			`@echo "--> Compress static files(css) to media/CACHE"`
			`rm -rf media/CACHE 2> /dev/null`
			`- python manage.py compress`
seafile-seahub: de-couple build a bit more seafile-seahub's build is a mess. It hijacks some OpenWrt mk files into the build. This can be avoided by provided some of the required parameters via env-vars and patching the env-vars into the build. Which is what this patch does. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com> (cherry-picked from commit cf9975544476fc268432fcb24b07707b4f5ba39a) 2019-06-03 12:17:23 +00:00			`+ $(PYTHON) manage.py compress`
seafile: upgrade to 6.2.2 Signed-off-by: Gergely Kiss <mail.gery@gmail.com> 2017-10-22 21:43:09 +00:00
			`clean:`
			`@echo '--> Cleaning media/static cache & dist'`