From 1ef287e9b1387ca0e76f378e30e7a51ec439f952 Mon Sep 17 00:00:00 2001
From: Tharre <tharre3@gmail.com>
Date: Tue, 18 Nov 2014 22:29:22 +0100
Subject: Remove Redofile as an alias for default.do

---
 Redofile    | 24 ------------------------
 default.do  | 24 ++++++++++++++++++++++++
 src/build.c |  6 ------
 3 files changed, 24 insertions(+), 30 deletions(-)
 delete mode 100644 Redofile
 create mode 100644 default.do

diff --git a/Redofile b/Redofile
deleted file mode 100644
index 1572634..0000000
--- a/Redofile
+++ /dev/null
@@ -1,24 +0,0 @@
-# define all project wide variables
-
-export ROOTDIR=$(pwd)
-export SRCDIR=$ROOTDIR/src
-export OUTDIR=$ROOTDIR/out
-export VERSION="pre-0.01"
-
-DESTDIR=${DESTDIR-/usr/bin}
-
-if [ "$1" = "all" ]; then
-	redo-ifchange $OUTDIR/redo
-elif [ "$1" = "clean" ]; then
-	rm -rf $OUTDIR/*.tmp $OUTDIR/*.o $OUTDIR/redo $OUTDIR/CC
-	# autoconf stuff
-	rm -rf autom4te.cache config.h.in configure config.status config.log config.h
-elif [ "$1" = "install" ]; then
-	redo-ifchange all
-	mkdir -p $DESTDIR
-	install $OUTDIR/redo $DESTDIR
-	ln -sf $DESTDIR/redo $DESTDIR/redo-ifchange
-	ln -sf $DESTDIR/redo $DESTDIR/redo-ifcreate
-	ln -sf $DESTDIR/redo $DESTDIR/redo-always
-	echo "Finished installing."
-fi
diff --git a/default.do b/default.do
new file mode 100644
index 0000000..1572634
--- /dev/null
+++ b/default.do
@@ -0,0 +1,24 @@
+# define all project wide variables
+
+export ROOTDIR=$(pwd)
+export SRCDIR=$ROOTDIR/src
+export OUTDIR=$ROOTDIR/out
+export VERSION="pre-0.01"
+
+DESTDIR=${DESTDIR-/usr/bin}
+
+if [ "$1" = "all" ]; then
+	redo-ifchange $OUTDIR/redo
+elif [ "$1" = "clean" ]; then
+	rm -rf $OUTDIR/*.tmp $OUTDIR/*.o $OUTDIR/redo $OUTDIR/CC
+	# autoconf stuff
+	rm -rf autom4te.cache config.h.in configure config.status config.log config.h
+elif [ "$1" = "install" ]; then
+	redo-ifchange all
+	mkdir -p $DESTDIR
+	install $OUTDIR/redo $DESTDIR
+	ln -sf $DESTDIR/redo $DESTDIR/redo-ifchange
+	ln -sf $DESTDIR/redo $DESTDIR/redo-ifcreate
+	ln -sf $DESTDIR/redo $DESTDIR/redo-always
+	echo "Finished installing."
+fi
diff --git a/src/build.c b/src/build.c
index b8d4b38..72ec38a 100644
--- a/src/build.c
+++ b/src/build.c
@@ -40,7 +40,6 @@ static void write_dep_hash(const char *target);
 struct do_attr {
 	char *specific;
 	char *general;
-	char *redofile;
 	char *chosen;
 };
 
@@ -203,21 +202,17 @@ static struct do_attr *get_dofiles(const char *target) {
 	dofiles->specific = concat(2, target, ".do");
 	if (!is_absolute(target)) {
 		dofiles->general = concat(3, "default", take_extension(target), ".do");
-		dofiles->redofile = xstrdup("Redofile");
 	} else {
 		char *dirc = xstrdup(target);
 		char *dt = dirname(dirc);
 
 		dofiles->general = concat(4, dt, "/default", take_extension(target), ".do");
-		dofiles->redofile = concat(2, dt, "/Redofile");
 	}
 
 	if (fexists(dofiles->specific))
 		dofiles->chosen = dofiles->specific;
 	else if (fexists(dofiles->general))
 		dofiles->chosen = dofiles->general;
-	else if (fexists(dofiles->redofile))
-		dofiles->chosen = dofiles->redofile;
 	else
 		dofiles->chosen = NULL;
 
@@ -229,7 +224,6 @@ static void free_do_attr(struct do_attr *thing) {
 	assert(thing);
 	free(thing->specific);
 	free(thing->general);
-	free(thing->redofile);
 	free(thing);
 }
 
-- 
cgit v1.2.3-70-g09d2