summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera2006-07-11 21:21:59 +0000
committerAlvaro Herrera2006-07-11 21:21:59 +0000
commit8ee0e5ed5036376f253967c72337243463da5838 (patch)
treeda6083912da6195996dcb0273dbbd23d9cde6bdb
parent6f55b641d1e1971c798a5f334fbaefa4fb8aa0cc (diff)
Apply entab fix from Marko Kreen for these problems:
- halt.c did not include stdlib.h, thus missed exit() prototype - Makefile ignores BINDIR for install. - Makefile calls install with user/group args, thus failing for regular user. While trying it I noticed that the Makefile does not support VPATH builds ...
-rw-r--r--src/tools/entab/Makefile4
-rw-r--r--src/tools/entab/halt.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/entab/Makefile b/src/tools/entab/Makefile
index d56accb704..64697a5d70 100644
--- a/src/tools/entab/Makefile
+++ b/src/tools/entab/Makefile
@@ -23,7 +23,7 @@ clean:
install:
make clean
make CFLAGS=-O
- install -s -o bin -g bin $(TARGET) $(BINDIR)
+ install -s $(TARGET) $(BINDIR)
rm -f $(BINDIR)/detab
- ln /usr/local/bin/$(TARGET) $(BINDIR)/detab
+ ln $(BINDIR)/$(TARGET) $(BINDIR)/detab
diff --git a/src/tools/entab/halt.c b/src/tools/entab/halt.c
index 65e369bebe..bed8e45358 100644
--- a/src/tools/entab/halt.c
+++ b/src/tools/entab/halt.c
@@ -10,6 +10,7 @@
#include <stdarg.h>
#include <signal.h>
#include <stdio.h>
+#include <stdlib.h>
#include <errno.h>