Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7234777

Browse files
committed
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 ...
1 parent d29b668 commit 7234777

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/tools/entab/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ clean:
2323
install:
2424
make clean
2525
make CFLAGS=-O
26-
install -s -o bin -g bin $(TARGET) $(BINDIR)
26+
install -s $(TARGET) $(BINDIR)
2727
rm -f $(BINDIR)/detab
28-
ln /usr/local/bin/$(TARGET) $(BINDIR)/detab
28+
ln $(BINDIR)/$(TARGET) $(BINDIR)/detab
2929

src/tools/entab/halt.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
**
33
** halt.c
44
**
5-
** $PostgreSQL: pgsql/src/tools/entab/halt.c,v 1.9 2006/03/11 04:38:41 momjian Exp $
5+
** $PostgreSQL: pgsql/src/tools/entab/halt.c,v 1.10 2006/07/11 21:21:59 alvherre Exp $
66
**
77
** This is used to print out error messages and exit
88
*/
99

1010
#include <stdarg.h>
1111
#include <signal.h>
1212
#include <stdio.h>
13+
#include <stdlib.h>
1314
#include <errno.h>
1415

1516

0 commit comments

Comments
 (0)