summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-10-22 12:01:04 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-10-22 12:01:56 +0200
commit2dbe9edb06abfa7a0127344c6f5bb616b6654160 (patch)
tree3b94d51e0a1c595ca260007f07dbc5b257433a90
parent13c698fa26eaa91cc9310aac52ee5c45cf3f60f5 (diff)
downloadqtlocation-mapboxgl-2dbe9edb06abfa7a0127344c6f5bb616b6654160.tar.gz
write to correct file and add to gitignore
-rw-r--r--.gitignore3
-rwxr-xr-xconfigure4
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 23dbb0f8f7..04eb4ad884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,11 @@
*.actual.png
*.diff.png
/node_modules
-/mapnik-packaging
+/mason_packages
/macosx/build
/ios/build
/config.gypi
+/config-ios.gypi
/config/constants_local.cpp
/build
/bin/node_modules
diff --git a/configure b/configure
index 4416299213..2fffd59206 100755
--- a/configure
+++ b/configure
@@ -126,6 +126,6 @@ CONFIG+=" }
}
"
-echo "${CONFIG}" > config.gypi
+echo "${CONFIG}" > ${CONFIG_FILE}
-cat config.gypi
+cat ${CONFIG_FILE}