From 483378740989b2f1d1a029aa5fb0156ae9fa18cc Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 2 May 2014 07:58:17 +0200 Subject: [PATCH] really install bootstrap files --- copyright | 2 +- www/Makefile | 2 +- www/bootstrap/Makefile | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/copyright b/copyright index 813eb372..3f06ae0c 100644 --- a/copyright +++ b/copyright @@ -29,7 +29,7 @@ Open Source License This version of Ext JS is licensed under the terms of the Open Source GPL 3.0 license. -http://www.gnu.org/licenses/gpl.html +http://www.gnu.org/licenses/gpl.html (/usr/share/common-licenses/GPL-3) There are several FLOSS exceptions available for use with this release for open source applications that are distributed under a license other than GPL. diff --git a/www/Makefile b/www/Makefile index 67de9d19..60e1fada 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -SUBDIRS = images ext4 css manager +SUBDIRS = images ext4 css manager bootstrap all: ${SUBDIRS} diff --git a/www/bootstrap/Makefile b/www/bootstrap/Makefile index be493fd5..b9c49865 100644 --- a/www/bootstrap/Makefile +++ b/www/bootstrap/Makefile @@ -3,9 +3,11 @@ include ../../defines.mk BTDIR=bootstrap-3.1.1-dist BTSRC=${BTDIR}.zip -BTDATA = \ - ${BTDIR}/css/bootstrap.min.css \ - ${BTDIR}/js/bootstrap.min.js +BTDATA = \ + ${BTDIR}/css/bootstrap.min.css \ + ${BTDIR}/css/bootstrap-theme.min.css \ + ${BTDIR}/js/bootstrap.min.js \ + ${BTDIR}/fonts/glyphicons-halflings-regular.ttf ${BTDATA}: ${BTSRC} rm -rf ${BTDIR} @@ -18,8 +20,10 @@ all: ${BTDATA} install: ${BTDATA} install -d ${WWWCSSDIR} install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap.min.css ${WWWCSSDIR} + install -m 0644 -o www-data -g www-data ${BTDIR}/css/bootstrap-theme.min.css ${WWWCSSDIR} install -d ${WWWJSDIR} install -m 0644 -o www-data -g www-data ${BTDIR}/js/bootstrap.min.js ${WWWJSDIR} + install -m 0644 ${BTDIR}/fonts/glyphicons-halflings-regular.ttf ${WWWIMAGEDIR} .PHONY: distclean distclean: clean