Mercurial > mxe-octave

changeset 2413:c906500af274

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'stable'
author Volker Grabsch <vog@notjusthosting.com>
date Mon, 16 Apr 2012 14:54:31 +0200
parents 89d0ae6cb123 (current diff) 88cb2ceccacb (diff)
children 639f0e5a9afa
files
diffstat 2 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.gitignore	Mon Apr 16 03:40:31 2012 +1000
+++ b/.gitignore	Mon Apr 16 14:54:31 2012 +0200
@@ -1,5 +1,4 @@
-usr/
-log/
-pkg
-dist/
-wip/
+/usr/
+/log/
+/pkg
+/wip/
--- a/Makefile	Mon Apr 16 03:40:31 2012 +1000
+++ b/Makefile	Mon Apr 16 14:54:31 2012 +0200
@@ -23,7 +23,6 @@
 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)))