Add DASH_N, BACKSLASH_C variables, moved from postgres.shell.mk.

src/Makefile.global

@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.61 1996/11/11 12:19:05 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.62 1996/11/11 13:24:43 bryanh Exp $
 #
 # NOTES
 #    This is seen by any Makefiles that include mk/postgres.mk. To
@@ -37,29 +37,30 @@
 # of the port.
 
 #  The name of the port.  Valid choices are:
-#	alpha		-	DEC Alpha AXP on OSF/1 2.0
-#	hpux		-	HP PA-RISC on HP-UX 9.0
-#	i386_solaris	-	i386 Solaris
-#	sparc_solaris	-	SUN SPARC on Solaris 2.4
-#	sparc		-	SUN SPARC on SunOS 4.1.3
-#	ultrix4		-	DEC MIPS on Ultrix 4.4
-#	linux		-	Intel x86 on Linux 1.2 and Linux ELF
+#   alpha          DEC Alpha AXP on OSF/1 2.0
+#   hpux           HP PA-RISC on HP-UX 9.0
+#   i386_solaris   i386 Solaris
+#   sparc_solaris  SUN SPARC on Solaris 2.4
+#   sparc          SUN SPARC on SunOS 4.1.3
+#   ultrix4        DEC MIPS on Ultrix 4.4
+#   linux          Intel x86 on Linux 1.2 and Linux ELF
 #                  (For non-ELF Linux, see LINUX_ELF below).
-#	BSD44_derived	-	OSs derived from 4.4-lite BSD (NetBSD, FreeBSD)
-#       bsdi            -       BSD/OS 2.0, 2.01, 2.1
-#	aix		-	IBM on AIX 3.2.5
-#	irix5		-	SGI MIPS on IRIX 5.3
-#	dgux            -       DG/UX 5.4R3.10
+#   BSD44_derived  OSs derived from 4.4-lite BSD (NetBSD, FreeBSD)
+#   bsdi           BSD/OS 2.0, 2.01, 2.1
+#   aix            IBM on AIX 3.2.5
+#   irix5          SGI MIPS on IRIX 5.3
+#   dgux           DG/UX 5.4R3.10
 #  Some hooks are provided for
-#	svr4		-	Intel x86 on Intel SVR4
-#	next		-	Motorola MC68K or Intel x86 on NeXTSTEP 3.2
+#   svr4           Intel x86 on Intel SVR4
+#   next           Motorola MC68K or Intel x86 on NeXTSTEP 3.2
 #  but these are guaranteed not to work as of yet.
 #
 #  Note that portname is defined here to be UNDEFINED to remind you
 #  to change it in Makefile.custom.
+#
 #  make sure that you have no whitespaces after the PORTNAME setting
 #  or the makefiles can get confused
-PORTNAME=	UNKNOWN
+PORTNAME= UNDEFINED
 
 # Ignore LINUX_ELF if you're not using Linux.  But if you are, and you're
 # compiling to a.out (which means you're using the dld dynamic loading 
@@ -69,11 +70,13 @@ LINUX_ELF= 1
 # SRCDIR specifies where the source files are.  It should be defined before
 # we are included, but for transition purposes, we put this default here.
 ifdef SRCDIR
-MKDIR= $(SRCDIR)/mk
+MKDIR:= $(SRCDIR)/mk
 else
-SRCDIR=		/usr/local/pgsql/src
+SRCDIR:= $(MKDIR)/..
 endif
 
+LIBPQDIR:= $(SRCDIR)/libpq
+
 # For convenience, POSTGRESDIR is where DATADIR, BINDIR, and LIBDIR 
 # and other target destinations are rooted.  Of course, each of these is 
 # changable separately.
@@ -130,9 +133,9 @@ POSTPORT= 5432
 # THERE ARE REDUNDANT DEFINITIONS OF THESE VALUES IN config.h.
 # Don't change anything here without changing it there too.
 
-NAMEDATALEN = 32
+NAMEDATALEN= 32
 # OIDNAMELEN should be set to NAMEDATALEN + sizeof(Oid)
-OIDNAMELEN = 36
+OIDNAMELEN= 36
  
 ##############################################################################
 #
@@ -221,32 +224,47 @@ endif
 #
 TCL_INCDIR= /home/tools/include
 TCL_LIBDIR= /home/tools/lib
-TCL_LIB = -ltcl7.5
+TCL_LIB= -ltcl7.5
 TK_INCDIR= /home/tools/include
 TK_LIBDIR= /home/tools/lib
-TK_LIB = -ltk4.1
+TK_LIB= -ltk4.1
 
-X11_INCDIR = /usr/include
-X11_LIBDIR = /usr/lib
-X11_LIB = -lX11 -lsocket -lnsl
+X11_INCDIR= /usr/include
+X11_LIBDIR= /usr/lib
+X11_LIB= -lX11 -lsocket -lnsl
 
 ##############################################################################
 #
 #  YACC
 
-YFLAGS = -d
+YFLAGS= -d
 
 ##############################################################################
 #
 # Installation. 
 #
 # For many ports, INSTALL is overridden below.
-INSTALL = install
-RANLIB = ranlib 
+INSTALL= install
+RANLIB= ranlib 
+
+INSTLOPTS= -c -m 444
+INSTL_EXE_OPTS= -c -m 555
+INSTL_LIB_OPTS= -c -m 664
+
+##############################################################################
+#
+# For building shell scripts:
+# 
+# For many ports, these are overridden below.
+
+# DASH_N is what we put before the text on an echo command when we don't
+# want a trailing newline.  BACKSLASH_C is what we put at the end of the
+# string on a echo command when we don't want a trailing newline.  On
+# some systems, you do echo -n "no newline after this", while on others
+# you do echo "no newline after this\c".
 
-INSTLOPTS = -c -m 444
-INSTL_EXE_OPTS = -c -m 555
-INSTL_LIB_OPTS = -c -m 664
+DASH_N= -n
+BACKSLASH_C=
 
 
 objdir= obj
@@ -314,13 +332,13 @@ INSTALL=	/usr/bin/install
 RANLIB=	/usr/bin/ranlib
 
 # FreeBSD 2.1R with new Flex v2.5.2 in /usr/local
-LEX = flex
+LEX= flex
 LDADD+= -L/usr/local/lib -lfl
 
 #
 # for postgres.user.mk
 #
-CFLAGS_SL = -fpic -DPIC
+CFLAGS_SL= -fpic -DPIC
 
 ifneq ($(HOSTTYPE), mips)
 SLSUFF=	.so
@@ -407,7 +425,7 @@ CFLAGS_BE+= -DNOPRINTADE
 endif
 
 # use the regex library
-USE_REGEX = 1
+USE_REGEX= 1
 
 #
 # for postgres.user.mk
@@ -420,11 +438,8 @@ SLSUFF=		.so
 
 CLEANFILES+= so_locations
 
-#
-# for postgres.shell.mk
-#
 DASH_N=
-BACKSLASH_C='\\\\c'
+BACKSLASH_C= '\\\\c'
 
 endif
 
@@ -453,9 +468,9 @@ else
 # gcc is gcc v2.6.3
   LEX= flex
 # use the regex library
-  USE_REGEX = 1
-  CFLAGS_BE = -DPRE_BSDI_2_1
-  LDADD_BE = -ldld -lcompat
+  USE_REGEX= 1
+  CFLAGS_BE= -DPRE_BSDI_2_1
+  LDADD_BE= -ldld -lcompat
 endif
 
 #
@@ -486,8 +501,8 @@ CC=		gcc
 CFLAGS_BE= -D__USE_POSIX_SIGNALS -DUSE_POSIX_SIGNALS
 LDADD_BE= -ldl -lfl
 
-LEX = flex
-YACC = bison -y
+LEX= flex
+YACC= bison -y
 
 INSTALL=/usr/bin/X11/bsdinst
 
@@ -507,8 +522,8 @@ ifdef ENFORCE_ALIGNMENT
 CFLAGS_BE= -DNOFIXADE
 else
 HPUX_VERS:= $(shell uname -r)
-HPUX_MAJOR=${HPUX_VERS:R:E}
-HPUX_MINOR=${HPUX_VERS:E}
+HPUX_MAJOR= ${HPUX_VERS:R:E}
+HPUX_MINOR= ${HPUX_VERS:E}
    ifeq ($(HPUX_MAJOR), 08)
       CFLAGS_BE+= +u -DHP_S500_ALIGN
       LDFLAGS_BE+= +u
@@ -531,7 +546,7 @@ endif
 INSTALL= bsdinst
 
 # RANLIB is not used on HP-UX
-RANLIB=touch
+RANLIB= touch
 
 #
 # for postgres.user.mk
@@ -542,11 +557,8 @@ SLSUFF=		.sl
 %.sl: %.o
 	$(LD) -b -o $(objdir)/$(@F) $(objdir)/$(<F)
 
-#
-# for postgres.shell.mk
-#
 DASH_N= ''
-BACKSLASH_C='\\\\c'
+BACKSLASH_C= '\\\\c'
 
 endif
 
@@ -564,9 +576,9 @@ CC=		gcc
 CFLAGS_BE+= -DUSE_POSIX_SIGNALS
 
 # RANLIB is not used on solaris
-RANLIB=touch
+RANLIB= touch
 
-INSTALL=/usr/ucb/install
+INSTALL= /usr/ucb/install
 
 #
 # Random things that must be passed everywhere to enable 
@@ -592,9 +604,6 @@ SLSUFF=		.so
 %.so: %.o
 	$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
 
-#
-# for postgres.shell.mk
-#
 DASH_N=''
 BACKSLASH_C='\\\\c'
 
@@ -613,9 +622,9 @@ CC=		cc
 CFLAGS_BE+= -DUSE_POSIX_SIGNALS
 
 # RANLIB is not used on IRIX 5
-RANLIB=touch
+RANLIB= touch
 
-INSTALL=/sbin/bsdinst
+INSTALL= /sbin/bsdinst
 
 INSTLOPTS=      -m 444
 INSTL_EXE_OPTS= -m 555
@@ -634,9 +643,6 @@ SLSUFF=		.so
 %.so: %.o
 	$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
 
-#
-# for postgres.shell.mk
-#
 DASH_N=''
 BACKSLASH_C='\\\\c'
 
@@ -656,7 +662,7 @@ endif
 MK_NO_LORDER= true
 
 # use the regex library
-USE_REGEX = 1
+USE_REGEX= 1
 
 #
 # for postgres.user.mk
@@ -674,7 +680,7 @@ CFLAGS_SL=	-fpic
 CFLAGS_BE= -D__USE_BSD -D__USE_BSD_SIGNAL
 LDADD_BE= -lbsd
 
-LEX = flex
+LEX= flex
 
 endif
 
@@ -702,7 +708,6 @@ SLSUFF=		.so
 
 %.so: %.o
 	$(LD) -dc -dp -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
-
 endif
 
 #----------------------------------------------------------------------------
@@ -719,9 +724,9 @@ CC=		gcc
 CFLAGS_BE+= -DUSE_POSIX_SIGNALS
 
 # RANLIB is not used on solaris
-RANLIB=touch
+RANLIB= touch
 
-INSTALL=/usr/ucb/install
+INSTALL= /usr/ucb/install
 
 #
 # Random things that must be passed everywhere to enable 
@@ -747,11 +752,8 @@ SLSUFF=		.so
 %.so: %.o
 	$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
 
-#
-# for postgres.shell.mk
-#
-DASH_N=''
-BACKSLASH_C='\\\\c'
+DASH_N= ''
+BACKSLASH_C= '\\\\c'
 
 endif
 
@@ -760,9 +762,7 @@ endif
 ifeq ($(PORTNAME), svr4)
 MK_PORT= svr4
 
-# cc won't work?
-#CC=	gcc
-CC=	cc -W0
+CFLAGS+= -W0
 YACC= bison -y
 
 #
@@ -775,10 +775,10 @@ CFLAGS_BE+= -DUSE_POSIX_SIGNALS
 MAKE_EXPORTS= true
 
 # RANLIB is not used on svr4
-RANLIB=touch
+RANLIB= touch
 
 # GNU install
-INSTALL=/home/tools/bin/install
+INSTALL= /home/tools/bin/install
 
 #
 # Random things that must be passed everywhere to enable
@@ -790,14 +790,9 @@ LDADD_BE+= -lsocket -lnsl -lc /usr/ucblib/libucb.a
 
 LD_ADD+= $(LDADD_BE)
 
-#
-# for postgres.mk
-#
-
 #
 # for postgres.user.mk
 #
-#CFLAGS_SL=	-K pic
 ifeq ($(CC), cc)
 #CFLAGS_SL= -K PIC
 else
@@ -811,11 +806,8 @@ SLSUFF=		.so
 %.so: %.o
 	$(LD) -G -Bdynamic -o $(objdir)/$(@F) $(objdir)/$(<F)
 
-#
-# for postgres.shell.mk
-#
-DASH_N=''
-BACKSLASH_C='\\\\c'
+DASH_N= ''
+BACKSLASH_C= '\\\\c'
 endif
 
 #---------------------------------------------------------------------------
@@ -855,8 +847,7 @@ srcdir=		$(SRCDIR)
 includedir= $(HEADERDIR)
 
 
-# This goes here so that customizations in Makefile.custom and port
-# specific changes above are effective
+# This goes here so that customization in Makefile.custom is effective
 ##############################################################################
 #
 # Flags for CC and LD. (depend on COPT and PROFILE)
@@ -895,7 +886,3 @@ CFLAGS+= $(CFLAGS_BE)
 LDADD+= $(LDADD_BE)
 LDFLAGS+= $(LDFLAGS_BE)
 
-ifeq ($(USE_READLINE), false)
-CFLAGS += -DNOREADLINE
-endif
-