hwinfo in den Installer gebracht.

[people/pmueller/ipfire-2.x.git] / lfs / hwinfo

diff --git a/lfs/hwinfo b/lfs/hwinfo
index d9e4500aa52f8389e87a12e56daf33e98fbd32ab..51c330764a58323a3b0a46297cd809e38cf3cc35 100644 (file)
--- a/lfs/hwinfo
+++ b/lfs/hwinfo
@@ -26,12 +26,15 @@
 
 include Config
 
-VER = ipfire
-
-THISAPP    = hwinfo
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+VER        = ipfire
 
+THISAPP    = hwinfo-$(VER)
+DIR_APP    = $(DIR_SRC)/hwinfo
+ifeq "$(LFS_PASS)" "install"
+  TARGET     = $(DIR_INFO)/$(THISAPP)-install
+else
+  TARGET     = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -51,8 +54,15 @@ md5 :
 
 $(TARGET) :
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && mkdir $(DIR_APP) && cp -R $(DIR_SRC)/src/hwinfo/* $(DIR_APP)
+       @rm -rf $(DIR_APP) && cp -av $(DIR_SRC)/src/hwinfo $(DIR_SRC)
+ifeq "$(LFS_PASS)" "install"
+       cd $(DIR_APP) && make CC="/opt/$(MACHINE)-uClibc/bin/$(MACHINE)-linux-gcc -I/opt/$(MACHINE)-uClibc/include" \
+               EXTRA_FLAGS="-fno-pic -DUCLIBC" \
+               SHARED_FLAGS= LIBS="-lhd -lsysfs"
+       install -m 755 hwinfo /install/initrd/sbin
+else
        cd $(DIR_APP) && make tinystatic
-       cd $(DIR_APP) && DESTDIR="/install/initrd" make tinystaticinstall
+       cd $(DIR_APP) && make tinystaticinstall
+endif
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)