Merge branch 'master' of git://git.ipfire.org/ipfire-3.x

Conflicts:
	lfs/libbdevid

diff --cc lfs/libbdevid
index 05d05535473797ef94875cc3ea8e8ebeb1fc42b2,1eb644c28445b4c2aa0ab79c105cd2e66f92af4d..303da1fae2eb4bec737dc5f2c45ef944d01642b8
--- 1/lfs/libbdevid
--- 2/lfs/libbdevid
+++ b/lfs/libbdevid
@@@ -74,7 -76,6 +76,7 @@@ $(objects)
  $(OBJECT): $(objects)
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && export VER=0.1; make install
 +      cd $(DIR_APP) && sed -e "s/^CFLAGS += -Iinclude/CFLAGS = $(CFLAGS) -fpic -Iinclude/g" -i Makefile
+       cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)