From 72347776744083d080f4c46dd6fc7e81bcf9a0c7 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 11 Jul 2006 21:21:59 +0000 Subject: [PATCH] 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 ... --- src/tools/entab/Makefile | 4 ++-- src/tools/entab/halt.c | 3 ++- 2 files changed, 4 insertions(+), 3 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 20a40231ea..af55fa9c2d 100644 --- a/src/tools/entab/halt.c +++ b/src/tools/entab/halt.c @@ -2,7 +2,7 @@ ** ** halt.c ** -** $PostgreSQL: pgsql/src/tools/entab/halt.c,v 1.9 2006/03/11 04:38:41 momjian Exp $ +** $PostgreSQL: pgsql/src/tools/entab/halt.c,v 1.10 2006/07/11 21:21:59 alvherre Exp $ ** ** This is used to print out error messages and exit */ @@ -10,6 +10,7 @@ #include #include #include +#include #include