X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=onelab.mk;h=29a2e45973a7cc38a3125997284a16e04e5ee368;hb=9fd099773d3915beac45e65b03fdce36b6b03c88;hp=51ed317e679a3591663d6b50d0af2ec80915767a;hpb=cd0e97e5516ad6b482ce8bb12aeeee34f3ec4c0b;p=build.git

diff --git a/onelab.mk b/onelab.mk
index 51ed317e..29a2e459 100644
--- a/onelab.mk
+++ b/onelab.mk
@@ -56,9 +56,6 @@ ipfwslice-SPECVARS = kernel_version=$(kernel.rpm-version) \
         kernel_arch=$(kernel.rpm-arch)
 ALL += ipfwslice
 
-# this doesn't build on f12 - weird all right - I suspect gcc to be smarter but that needs investigation
-# is madwifi still current anyway ? should we move to ath5k instead ?
-#ifneq "$(DISTRONAME)" "f12"
 #
 # madwifi
 #
@@ -71,7 +68,6 @@ madwifi-SPECVARS = kernel_version=$(kernel.rpm-version) \
 	kernel_arch=$(kernel.rpm-arch)
 ALL += madwifi
 IN_BOOTSTRAPFS += madwifi
-#endif
 
 # 
 # nozomi
@@ -366,8 +362,9 @@ ALL += pyaspects
 ejabberd-MODULES := ejabberd
 ejabberd-SPEC := ejabberd.spec
 ejabberd-BUILD-FROM-SRPM := yes
-# tmp - skip on f14 for now
-ifneq ($(DISTRONAME),f14)
+# not needed anymore on f12 and above, that come with 2.1.5, and we had 2.1.3
+# so, this is relevant on f8 and centos5 only
+ifeq "$(DISTRONAME)" "$(filter $(DISTRONAME),f8 centos5)"
 ALL += ejabberd
 endif