From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 26 Feb 2018 22:06:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/core119' into kernel-4.14
X-Git-Tag: v2.21-core122~178^2~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a7cfc2f10f0dc143680daaf5da244ef5e186c27;p=ipfire-2.x.git

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

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

1a7cfc2f10f0dc143680daaf5da244ef5e186c27
diff --cc lfs/flex
index d665c47be5,4037e93e45..ff3efccfee
--- a/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