mirror of https://github.com/postgres/postgres
Move YACC and YFLAGS into the template files
Clean up the .sample files...comment out all sample entries except for the localhost one
This commit is contained in:
parent
c7b40e6058
commit
eda9d69d6c
|
@ -7,7 +7,7 @@
|
|||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.18 1997/04/04 10:38:23 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.19 1997/04/04 11:21:39 scrappy Exp $
|
||||
#
|
||||
# NOTES
|
||||
# Essentially all Postgres make files include this file and use the
|
||||
|
@ -198,11 +198,6 @@ X11_INCDIR= /usr/include
|
|||
X11_LIBDIR= /usr/lib
|
||||
X11_LIB= -lX11 @SOCKET_LIB@ @NSL_LIB@
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# YACC
|
||||
|
||||
YFLAGS= -d
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
|
@ -247,6 +242,8 @@ endif
|
|||
# See the subdirectory template for default settings for these
|
||||
#-------------------------------------------------------------
|
||||
CC= @CC@
|
||||
YFLAGS= @YFLAGS@
|
||||
YACC= @YACC@
|
||||
LEX= @LEX@
|
||||
AROPT= @AROPT@
|
||||
CFLAGS= @CPPFLAGS@ @CFLAGS@
|
||||
|
@ -306,9 +303,6 @@ endif
|
|||
ifeq ($(PORTNAME), dgux)
|
||||
%.so: %.o
|
||||
$(CC) -shared -o $@ $<
|
||||
|
||||
YACC= bison -y
|
||||
|
||||
endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
@ -342,11 +336,8 @@ endif
|
|||
#--------------------------------------------------------------------------
|
||||
|
||||
ifeq ($(PORTNAME), i386_solaris)
|
||||
# cc won't work!
|
||||
|
||||
%.so: %.o
|
||||
$(LD) -G -Bdynamic -o $@ $<
|
||||
|
||||
endif
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
@ -384,17 +375,13 @@ endif
|
|||
#----------------------------------------------------------------------------
|
||||
|
||||
ifeq ($(PORTNAME), sparc_solaris)
|
||||
|
||||
%.so: %.o
|
||||
$(LD) -G -Bdynamic -o $@ $<
|
||||
|
||||
endif
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
|
||||
ifeq ($(PORTNAME), svr4)
|
||||
YACC= bison -y
|
||||
|
||||
# MAKE_EXPORTS is required for svr4 loaders that want a file of
|
||||
# symbol names to tell them what to export/import.
|
||||
MAKE_EXPORTS= true
|
||||
|
@ -420,8 +407,6 @@ endif
|
|||
# The univel port is almost guaranteed NOT to work yet.
|
||||
#
|
||||
ifeq ($(PORTNAME), univel)
|
||||
YACC= bison -y
|
||||
|
||||
# MAKE_EXPORTS is required for svr4 loaders that want a file of
|
||||
# symbol names to tell them what to export/import.
|
||||
#MAKE_EXPORTS= true
|
||||
|
|
|
@ -80,7 +80,7 @@ host all 127.0.0.1 255.255.255.255 trust
|
|||
# The above allows any user on the local system to connect to any database
|
||||
# under any username.
|
||||
|
||||
host template1 192.168.0.0 255.255.255.0 ident sameuser
|
||||
#host template1 192.168.0.0 255.255.255.0 ident sameuser
|
||||
|
||||
# The above allows any user from any host with IP address 192.168.0.x to
|
||||
# connect to database template1 as the same username that ident on that host
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
# A user always has to specify when he connects what Postgres username he is
|
||||
# using. This file is only used to validate that selection.
|
||||
|
||||
testmap robert bob
|
||||
testmap lucy lucy
|
||||
#testmap robert bob
|
||||
#testmap lucy lucy
|
||||
|
||||
|
||||
|
|
|
@ -35,6 +35,8 @@ else
|
|||
USE_LOCALE=`grep USE_LOCALE $TEMPLATE | awk -F: '{print $2}'`
|
||||
DLSUFFIX=`grep DLSUFFIX $TEMPLATE | awk -F: '{print $2}'`
|
||||
DL_LIB=`grep DL_LIB $TEMPLATE | awk -F: '{print $2}'`
|
||||
YACC=`grep YACC $TEMPLATE | awk -F: '{print $2}'`
|
||||
YFLAGS=`grep YFLAGS $TEMPLATE | awk -F: '{print $2}'`
|
||||
fi
|
||||
|
||||
$ECHO_N "Additional directories to search for .h files [$SRCH_INC]: $ECHO_C"
|
||||
|
@ -70,6 +72,7 @@ then
|
|||
IDIR=${a}
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "Define USE_LOCALE to get Postgres work (sort, search)"
|
||||
$ECHO_N "with national alphabet. [$USE_LOCALE]: $ECHO_C"
|
||||
read a
|
||||
|
@ -105,8 +108,8 @@ then
|
|||
NOHBA=${a}
|
||||
fi
|
||||
|
||||
export BUILDRUN USE_LOCALE DEF_PGPORT NOHBA AROPT DLSUFFIX DL_LIB
|
||||
export SHARED_LIB CFLAGS CPPFLAGS LDFLAGS
|
||||
export BUILDRUN USE_LOCALE DEF_PGPORT NOHBA AROPT DLSUFFIX DL_LIB YACC
|
||||
export SHARED_LIB CFLAGS CPPFLAGS LDFLAGS YFLAGS
|
||||
|
||||
./configure --prefix=${IDIR}
|
||||
|
||||
|
|
|
@ -3642,6 +3642,8 @@ s%@AROPT@%$AROPT%g
|
|||
s%@SHARED_LIB@%$SHARED_LIB%g
|
||||
s%@DLSUFFIX@%$DLSUFFIX%g
|
||||
s%@DL_LIB@%$DL_LIB%g
|
||||
s%@YACC@%$YACC%g
|
||||
s%@YFLAGS@%$YFLAGS%g
|
||||
s%@HAVECXX@%$HAVECXX%g
|
||||
s%@INSTALL@%$INSTALL%g
|
||||
s%@BSDINST@%$BSDINST%g
|
||||
|
|
|
@ -59,8 +59,8 @@ AC_SUBST(SHARED_LIB)
|
|||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(DLSUFFIX)
|
||||
AC_SUBST(DL_LIB)
|
||||
|
||||
|
||||
AC_SUBST(YACC)
|
||||
AC_SUBST(YFLAGS)
|
||||
|
||||
dnl ****************************************************************
|
||||
dnl Hold off on the C++ stuff until we can figure out why it doesn't
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -12,3 +12,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:/usr/local/include
|
|||
SRCH_LIB:/usr/local/lib
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.o
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:/usr/local/include
|
|||
SRCH_LIB:/usr/local/lib
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.o
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:bison -y
|
||||
|
|
|
@ -5,3 +5,5 @@ SRCH_INC:/usr/local/include
|
|||
SRCH_LIB:/usr/local/lib
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:bison -y
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.sl
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -7,3 +7,5 @@ SRCH_LIB:
|
|||
USE_LOCALE:no
|
||||
DL_LIB:/usr/lib/libdld.sl
|
||||
DLSUFFIX:.sl
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.o
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.o
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:bison -y
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.o
|
||||
YFLAGS:-d
|
||||
YACC:
|
||||
|
|
|
@ -6,3 +6,5 @@ SRCH_INC:
|
|||
SRCH_LIB:
|
||||
USE_LOCALE:no
|
||||
DLSUFFIX:.so
|
||||
YFLAGS:-d
|
||||
YACC:bison -y
|
||||
|
|
Loading…
Reference in New Issue