Merge commit 'remotes/mpokrywka/master'

drogus · Jan 29, 2011 · 0d0320c · 0d0320c
2 parents e8a9850 + 307413e
commit 0d0320c
Show file tree

Hide file tree

Showing 2 changed files with 167 additions and 337 deletions.
diff --git a/Makefile b/Makefile
@@ -1,11 +1,7 @@
 -include local-options.mk
 
 ifndef APXS
-  APXS := $(shell which apxs2)
-endif
-
-ifndef APXS
-  APXS := $(shell which apxs)
+  APXS := $(shell which apxs2 || which apxs)
 endif
 
 ifndef APXS