]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Actually build bootstrap
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 May 2017 09:36:43 +0000 (10:36 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 22 Sep 2017 18:00:04 +0000 (19:00 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/bootstrap
make.sh

index 2487dcc7e8f41729f857e518327d2abed00f41d5..15e882e8a7467f7314f00a0658411da5c210bdcf 100644 (file)
@@ -72,8 +72,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && unzip $(DIR_DL)/$(DL_FILE)
 
        -mkdir -pv /usr/share/bootstrap/{css,js}
-       $(DIR_APP) && cp -vf css/* /usr/share/bootstrap/css
-       $(DIR_APP) && cp -vf js/*  /usr/share/bootstrap/js
+       cd $(DIR_APP) && cp -vf css/* /usr/share/bootstrap/css
+       cd $(DIR_APP) && cp -vf js/*  /usr/share/bootstrap/js
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index fd1bbcaa81b28c26aa3185520c56a020ade7837c..ed9a7c5b02188c59f83b2856079f4470ebdee5d5 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -548,6 +548,7 @@ buildipfire() {
   lfsmake2 web-user-interface
   lfsmake2 flag-icons
   lfsmake2 jquery
+  lfsmake2 bootstrap
   lfsmake2 arping
   lfsmake2 beep
   lfsmake2 dvdrtools