From 8e878146e999a597c0a587c99237be42763737e1 Mon Sep 17 00:00:00 2001
From: Stephen Dwyer <scdwyer@ualberta.ca>
Date: Tue, 2 Aug 2011 00:46:17 -0600
Subject: [PATCH] updated .gitignore for maps.xml, deleted maps.xml, fixed typo
 in data/maps/Makefile

---
 .gitignore         | 1 +
 data/maps/Makefile | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b40917524e9..4e3b07d886b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@
 /conf/%gconf.xml
 /conf/srtm_data/*
 /conf/maps_data/*
+/conf/maps.xml
 /conf/gps/ublox_conf
 
 # /doc/pprz_algebra/
diff --git a/data/maps/Makefile b/data/maps/Makefile
index b9bc104c3cb..6ceb046a400 100644
--- a/data/maps/Makefile
+++ b/data/maps/Makefile
@@ -14,4 +14,4 @@ $(PAPARAZZI_HOME)/conf/maps.xml: $(DATADIR)/maps.google.com
 	$(Q)echo "<maps google_version=\""`grep -P "http://khm[0-9]+.google.com/kh/v=[0-9]+.x26" $(DATADIR)/maps.google.com | sed -E s#.*http://khm[0-9]+.google.com/kh/v=## | sed -E s#.x26.*##`"\"/>" >> $(@)
 	$(Q)echo "" >> $(@)
 
-Force:
+FORCE: