Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	lfs/pciutils

diff --cc lfs/pciutils
index 755fedc819a05797fff0588aad16eebdd4715465,2518a0f5dfb853e9047c0d57521d789d5a2a224a..3ce362f2ba7bda41f6caf1d698b4350976040b60
--- 1/lfs/pciutils
--- 2/lfs/pciutils
+++ b/lfs/pciutils
@@@ -53,13 -73,13 +73,13 @@@ $(objects)
  # Installation Details
  ###############################################################################
  
- $(OBJECT) : 
+ $(OBJECT): $(objects) 
        @$(PREBUILD)
 -      @rm -rf $(DIR_APP) && cd $(DIR_SRC) && $(EXTRACTOR) $(DIR_DL)/$(DL_FILE)
 -      cd $(DIR_APP) && make SHARED=yes OPT="$(CFLAGS)" PREFIX=/usr ZLIB=no $(PARALLELISMFLAGS)
 +      @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && make OPT=$(CLFLAGS) PREFIX=/usr ZLIB=no SHARED=yes $(PARALLELISMFLAGS)
-       cd $(DIR_APP) && make PREFIX=/usr SHARED=yes install
-       ln -svf libpci.so.3 /usr/lib/libpci.so
++      cd $(DIR_APP) && make SHARED=yes OPT=$(CLFLAGS) PREFIX=/usr ZLIB=no $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make SHARED=yes PREFIX=/usr install
        install -v -m 755 -d /usr/include/pci
        cd $(DIR_APP) && install -v -m 644 lib/*.h /usr/include/pci
+       ln -svf libpci.so.3 /usr/lib/libpci.so
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)