X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=849530d6db34c3321d75cf1a741e9d87b7cdd541;hb=9b43f7de695e9515fe7c80925bcb15b469c833e6;hp=333189185823c550be156c0ae13a5cb280efbbe4;hpb=4a4544bae4f7961f76cc84b1748493af41bc2f15;p=build.git

diff --git a/Makefile b/Makefile
index 33318918..849530d6 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ PLANETLAB_RELEASE = 5.2
 # Default values
 #
 # minimal compat with macos, just so this does not complain
-HOSTARCH := $(shell uname -i 2> /dev/null || uname -m 2> /dev/null)
+HOSTARCH := $(shell arch)
 DISTRO := $(shell ./getdistro.sh)
 RELEASE := $(shell ./getrelease.sh)
 DISTRONAME := $(shell ./getdistroname.sh)
@@ -348,9 +348,7 @@ header.spec:
 	echo "%global _source_filedigest_algorithm 1" >> $@
 	echo "%global _source_payload       w9.gzdio" >> $@
 	echo "%global _binary_payload       w9.gzdio" >> $@
-ifeq "$(DISTRONAME)""$(filter $(DISTRONAME),f25 f27 f29 f31 f33 f35)"
 	echo "%define debug_package %{nil}" >> $@
-endif
 
 ### make up spec file - extract module first
 define target_spec