Merge remote-tracking branch 'origin/core119' into kernel-4.14

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --cc lfs/flex
index d665c47be540819d7689ad63e78b7a62988ef685,4037e93e452ae0c67ef8fe9bbebab6c51220bbb8..ff3efccfee9cc49bce0b2c665f0b0cfa01fba3e2
--- 1/lfs/flex
--- 2/lfs/flex
+++ b/lfs/flex
@@@ -1,7 -1,7 +1,7 @@@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
--# Copyright (C) 2007-2016 IPFire Team  <info@ipfire.org>                      #
++# Copyright (C) 2007-2018 IPFire Team  <info@ipfire.org>                      #
  #                                                                             #
  # This program is free software: you can redistribute it and/or modify        #
  # it under the terms of the GNU General Public License as published by        #
@@@ -35,15 -35,8 +35,12 @@@ DIR_APP    = $(DIR_SRC)/$(THISAPP
  #
  ifeq "$(ROOT)" ""
    TARGET = $(DIR_INFO)/$(THISAPP)
 +  EXTRA_CONFIG = --prefix=/usr --disable-nls
 +  EXTRA_MAKE = 
 +  EXTRA_INSTALL = 
 +
  else
    TARGET = $(DIR_INFO)/$(THISAPP)-tools
-   EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-   EXTRA_MAKE = 
-   EXTRA_INSTALL = 
  endif
  
  

diff --cc make.sh
Simple merge