X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fbash;h=09b4e71e689f1120f3060e003f70ae4a80331e63;hb=5f9bf17d76e43b1ee0bb4b880a9aa001844e4d4a;hp=99a293dbb6b9753ccb6e3f6c1ad5ab0a21a76bd9;hpb=727ac931479d2c67f50692d5ac3807b1bf9d5dee;p=ipfire-2.x.git diff --git a/lfs/bash b/lfs/bash index 99a293dbb6..09b4e71e68 100644 --- a/lfs/bash +++ b/lfs/bash @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 IPFire Team # +# Copyright (C) 2007-2018 IPFire Team # # # # 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,11 +35,11 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) # ifeq "$(ROOT)" "" TARGET = $(DIR_INFO)/$(THISAPP) - CONFIGURE_OPTIONS = --prefix=/usr --bindir=/bin \ - --with-installed-readline + CONFIGURE_OPTIONS = \ + --bindir=/bin \ + --with-installed-readline else TARGET = $(DIR_INFO)/$(THISAPP)-tools - CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR) endif CONFIGURE_OPTIONS += \ @@ -95,7 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.2-ssh_source_bash.patch - cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS) + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install