Merge pull request #179 from scdwyer/dev

fixes Issue #175
paparazzi · Apr 16, 2012 · c0c5771 · c0c5771
2 parents ecb723b + dfd80b2
commit c0c5771
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/conf/autopilot/subsystems/fixedwing/autopilot.makefile b/conf/autopilot/subsystems/fixedwing/autopilot.makefile
@@ -174,7 +174,7 @@ ap_srcs			+= $(SRC_FIRMWARE)/ap_downlink.c
 
 UNAME = $(shell uname -s)
 ifeq ("$(UNAME)","Darwin")
-  sim.CFLAGS += $(shell if test -d /opt/local/include; then echo "-I/opt/local/include"; elif test -d /opt/paparazzi/include; then echo "-I/opt/paparazzi/include"; fi)
+  sim.CFLAGS += $(shell if test -d /opt/paparazzi/include; then echo "-I/opt/paparazzi/include"; elif test -d /opt/local/include; then echo "-I/opt/local/include"; fi)
 endif
 
 sim.CFLAGS              += $(CPPFLAGS)

diff --git a/sw/ground_segment/lpc21iap/Makefile b/sw/ground_segment/lpc21iap/Makefile
@@ -27,8 +27,8 @@ endif
 
 UNAME = $(shell uname -s)
 ifeq ("$(UNAME)","Darwin")
-  LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L/opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L/opt/paparazzi/lib"; fi)
-  INCLUDES = $(shell if test -d /opt/local/include; then echo "-I/opt/local/include"; elif test -d /opt/paparazzi/include; then echo "-I/opt/paparazzi/include"; fi)
+  LIBRARYS = $(shell if test -d /opt/paparazzi/lib; then echo "-L/opt/paparazzi/lib"; elif test -d /opt/local/lib; then echo "-L/opt/local/lib"; fi)
+  INCLUDES = $(shell if test -d /opt/paparazzi/include; then echo "-I/opt/paparazzi/include"; elif test -d /opt/local/include; then echo "-I/opt/local/include"; fi)
 endif
 
 CFLAGS  = -Wall -g $(FPIC) $(INCLUDES) $(LIBRARYS)

diff --git a/sw/ground_segment/misc/Makefile b/sw/ground_segment/misc/Makefile
@@ -1,8 +1,8 @@
 UNAME = $(shell uname -s)
 
 ifeq ("$(UNAME)","Darwin")
-  LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L/opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L/opt/paparazzi/lib"; fi)
-  INCLUDES = $(shell if test -d /opt/local/include; then echo "-I/opt/local/include"; elif test -d /opt/paparazzi/include; then echo "-I/opt/paparazzi/include"; fi)
+  LIBRARYS = $(shell if test -d /opt/paparazzi/lib; then echo "-L/opt/paparazzi/lib"; elif test -d /opt/local/lib; then echo "-L/opt/local/lib"; fi)
+  INCLUDES = $(shell if test -d /opt/paparazzi/include; then echo "-I/opt/paparazzi/include"; elif test -d /opt/local/include; then echo "-I/opt/local/include"; fi)
 else
   LIBRARYS = -s
 endif