X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fdiffutils;h=aee8f36f1e064ad5f94adfff257a10320ffdace1;hp=d3e957d82a8dea65c2dae414d1134a16cae386c4;hb=8be516b3bcc2b9f30f8d44f44450be57b68d0025;hpb=6c4cc7ea1bcb58c586ae64ae6f76720b6b89bda4 diff --git a/lfs/diffutils b/lfs/diffutils index d3e957d82a..aee8f36f1e 100644 --- a/lfs/diffutils +++ b/lfs/diffutils @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 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 # @@ -24,7 +24,7 @@ include Config -VER = 3.5 +VER = 3.6 THISAPP = diffutils-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -35,14 +35,8 @@ 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 --build=$(BUILDTARGET) - EXTRA_MAKE = - EXTRA_INSTALL = endif ############################################################################### @@ -53,7 +47,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 569354697ff1cfc9a9de3781361015fa +$(DL_FILE)_MD5 = 07cf286672ced26fba54cd0313bdc071 install : $(TARGET) @@ -83,8 +77,8 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) - cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) - cd $(DIR_APP) && make $(EXTRA_INSTALL) install + cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD)