Merge commit 'origin/master' into next

[ipfire-2.x.git] / lfs / kqemu

diff --git a/lfs/kqemu b/lfs/kqemu
index 8699ac921071a5772fd8f8d3821996a7fa44df44..d07d9f1cc9771f06314bdc19e568b8ac5c7cd9cb 100644 (file)
--- a/lfs/kqemu
+++ b/lfs/kqemu
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
 #                                                                             #
 # 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,18 +24,23 @@
 
 include Config
 
+ifeq "$(PAE)" "1"
+       VERSUFIX=ipfire-pae
+else
+ifeq "$(XEN)" "1"
+       VERSUFIX=ipfire-xen
+else
+       VERSUFIX=ipfire
+endif
+endif
+
 VER        = 1.4.0pre1
 
 THISAPP    = kqemu-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-ifeq "$(SMP)" "1"
-       TARGET     = $(DIR_INFO)/$(THISAPP)-smp
-else
-       TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)
-endif
-
+TARGET     = $(DIR_INFO)/$(THISAPP)-kmod-$(KVER)-$(VERSUFIX)
 
 ###############################################################################
 # Top-level Rules
@@ -80,18 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/usr/src/linux
        cd $(DIR_APP) && make $(MAKETUNING)
-               
-ifeq "$(SMP)" "1"
-#      cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire-smp/build/
-#      cd $(DIR_APP) && make $(MAKETUNING)
-       -mkdir -p /lib/modules/$(KVER)-ipfire-smp/misc/
-       cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire-smp/misc/
-else
-#      cd $(DIR_APP) && ./configure --prefix=/usr --kernel-path=/lib/modules/$(KVER)-ipfire/build/
-#      cd $(DIR_APP) && make $(MAKETUNING)
-       -mkdir -p /lib/modules/$(KVER)-ipfire/misc/
-       cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-ipfire/misc/
-endif
-       
+       -mkdir -p /lib/modules/$(KVER)-$(VERSUFIX)/misc/
+       cd $(DIR_APP) && install -m 644 kqemu.ko /lib/modules/$(KVER)-$(VERSUFIX)/misc/
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)