diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2006-07-11 21:21:59 +0000 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2006-07-11 21:21:59 +0000 |
| commit | 72347776744083d080f4c46dd6fc7e81bcf9a0c7 (patch) | |
| tree | 7a4350ff8fc166f2ea568749c1332b24d6daf3b8 /src | |
| parent | d29b66882a5de0878c496bd71d0c69af17197ab7 (diff) | |
| download | postgresql-72347776744083d080f4c46dd6fc7e81bcf9a0c7.tar.gz postgresql-72347776744083d080f4c46dd6fc7e81bcf9a0c7.zip | |
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 ...
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/entab/Makefile | 4 | ||||
| -rw-r--r-- | 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 d56accb704b..64697a5d700 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 20a40231eaf..af55fa9c2d5 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 <stdarg.h> #include <signal.h> #include <stdio.h> +#include <stdlib.h> #include <errno.h> |