summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2012-04-16 12:54:31 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2012-04-16 12:54:31 (GMT)
commitc2352afea1a4146a766235860994b53f81278dea (patch)
tree58b64cf0db4fb45425527783fa41d6ec02bd2a68
parent1c5da167d825747edb4e425c1328dce1428a9267 (diff)
parent615bef745cf29b546e8adee76bb550705bad2fd2 (diff)
downloadmxe-c2352afea1a4146a766235860994b53f81278dea.zip
mxe-c2352afea1a4146a766235860994b53f81278dea.tar.gz
mxe-c2352afea1a4146a766235860994b53f81278dea.tar.bz2
Merge branch 'stable'
-rw-r--r--.gitignore9
-rw-r--r--Makefile1
2 files changed, 4 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 707102d..ebab3b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
-usr/
-log/
-pkg
-dist/
-wip/
+/usr/
+/log/
+/pkg
+/wip/
diff --git a/Makefile b/Makefile
index 06767f0..46db92c 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@ PREFIX := $(PWD)/usr
LOG_DIR := $(PWD)/log
TIMESTAMP := $(shell date +%Y%m%d_%H%M%S)
PKG_DIR := $(PWD)/pkg
-DIST_DIR := $(PWD)/dist
TMP_DIR = $(PWD)/tmp-$(1)
MAKEFILE := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
TOP_DIR := $(patsubst %/,%,$(dir $(MAKEFILE)))