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

Commit 4283089

Browse files
committed
Okay, this shoudl provide a fix for the freebsd problem... Added a ELF_SYS variable and check to configure.in...
1 parent c633853 commit 4283089

File tree

5 files changed

+350
-322
lines changed

5 files changed

+350
-322
lines changed

src/Makefile.global.in

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.52 1998/10/19 00:00:40 tgl Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.53 1998/10/30 04:53:55 scrappy Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -49,6 +49,10 @@
4949
# example of this), set BSD_SHLIB to null in Makefile.custom.
5050
BSD_SHLIB= true
5151

52+
# This is mainly for use on FreeBSD, where we have both a.out and elf
53+
# systems now. May be applicable to other systems to?
54+
ELF_SYSTEM= @ELF_SYS@
55+
5256
LIBPQDIR:= $(SRCDIR)/interfaces/libpq
5357

5458
# For convenience, POSTGRESDIR is where BINDIR, and LIBDIR

src/backend/parser/gram.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@
229229
*
230230
*
231231
* IDENTIFICATION
232-
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.47 1998/10/17 04:08:36 momjian Exp $
232+
* $Header: /cvsroot/pgsql/src/backend/parser/Attic/gram.c,v 2.48 1998/10/30 04:54:01 scrappy Exp $
233233
*
234234
* HISTORY
235235
* AUTHOR DATE MAJOR EVENT
@@ -4464,7 +4464,7 @@ static const short yycheck[] = { 3,
44644464
-1, -1, -1, -1, -1, -1, 204
44654465
};
44664466
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
4467-
#line 3 "/usr/local/bison/bison.simple"
4467+
#line 3 "/usr/share/misc/bison.simple"
44684468

44694469
/* Skeleton output parser for bison,
44704470
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -4657,7 +4657,7 @@ __yy_memcpy (char *to, char *from, int count)
46574657
#endif
46584658
#endif
46594659

4660-
#line 196 "/usr/local/bison/bison.simple"
4660+
#line 196 "/usr/share/misc/bison.simple"
46614661

46624662
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
46634663
into yyparse. The argument should have type void *.
@@ -10416,7 +10416,7 @@ case 930:
1041610416
break;}
1041710417
}
1041810418
/* the action file gets copied in in place of this dollarsign */
10419-
#line 498 "/usr/local/bison/bison.simple"
10419+
#line 498 "/usr/share/misc/bison.simple"
1042010420

1042110421
yyvsp -= yylen;
1042210422
yyssp -= yylen;

0 commit comments

Comments
 (0)