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

Commit e3649e9

Browse files
committed
Various improvements to reduce questions :)
Remove USE_LOCALE from Makefile.global.in Add USE_LOCALE to build/configure/config.h Add check for BUILDRUN in configure to make sure that build is run before configure
1 parent 4bc578e commit e3649e9

File tree

5 files changed

+226
-190
lines changed

5 files changed

+226
-190
lines changed

src/Makefile.global.in

+1-11
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.15 1997/04/02 18:10:32 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.16 1997/04/03 21:25:59 scrappy Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -146,11 +146,6 @@ ENFORCE_ALIGNMENT= true
146146
# Comment out PROFILE to generate a profile version of the binaries
147147
#PROFILE= -p -non_shared
148148

149-
# Define USE_LOCALE to get Postgres work (sort, search)
150-
# with national alphabet. Remember to define environment variables
151-
# $LC_COLLATE and $LC_CTYPE before starting postmaster !
152-
USE_LOCALE = 1
153-
154149
# If you plan to use Kerberos for authentication...
155150
#
156151
# Comment out KRBVERS if you do not use Kerberos.
@@ -721,11 +716,6 @@ ifndef CASSERT
721716
CFLAGS+= -DNO_ASSERT_CHECKING
722717
endif
723718

724-
ifdef USE_LOCALE
725-
CFLAGS+= -DUSE_LOCALE
726-
endif
727-
728-
729719
ifdef PROFILE
730720
CFLAGS+= $(PROFILE)
731721
LDFLAGS+= $(PROFILE)

src/build

+14-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
#
33
# PostgreSQL Build Script
44
#
5+
BUILDRUN=true
6+
57
if echo '\c' | grep -s c >/dev/null 2>&1
68
then
79
ECHO_N="echo -n"
@@ -30,14 +32,24 @@ then
3032
LDFLAGS="$ADD_LIB_DIRS" ; export LDFLAGS
3133
fi
3234

35+
IDIR=/usr/local/pgsql
3336
$ECHO_N "Installation directory [/usr/local/pgsql]: $ECHO_C"
3437
read a
3538
if [ "$a." != "." ]
3639
then
3740
IDIR=${a}
38-
else
39-
IDIR=/usr/local/pgsql
4041
fi
4142

43+
USE_LOCALE=no
44+
echo "Define USE_LOCALE to get Postgres work (sort, search)"
45+
$ECHO_N "with national alphabet. [no]: $ECHO_C"
46+
read a
47+
if [ "$a." != "." ]
48+
then
49+
USE_LOCALE=${a}
50+
fi
51+
52+
export BUILDRUN USE_LOCALE
53+
4254
./configure --prefix=${IDIR}
4355

0 commit comments

Comments
 (0)