aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/Makefile.global12
-rw-r--r--src/mk/postgres.user.mk15
-rw-r--r--src/test/regress/Makefile8
-rw-r--r--src/test/regress/create.source16
-rw-r--r--src/test/regress/expected.input16
-rw-r--r--src/tutorial/C-code/Makefile5
-rw-r--r--src/tutorial/Makefile6
7 files changed, 39 insertions, 39 deletions
diff --git a/src/Makefile.global b/src/Makefile.global
index 5060a501e04..cf58101d03a 100644
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.71 1996/11/18 02:23:16 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.72 1996/11/18 06:07:12 momjian Exp $
#
# NOTES
# Essentially all Postgres make files include this file and use the
@@ -289,7 +289,7 @@ endif
# Shared libraries.
# This is overridden for many PORTNAMEs below.
-SLSUFF= .so
+DLSUFFIX= .so
#----------------------------------------------------------------------
ifeq ($(PORTNAME), BSD44_derived)
@@ -476,7 +476,7 @@ INSTALL= bsdinst
RANLIB= touch
CFLAGS_SL= +z
-SLSUFF= .sl
+DLSUFFIX= .sl
%.sl: %.o
$(LD) -b -o $@ $<
@@ -547,10 +547,10 @@ endif
ifeq ($(PORTNAME), linux)
ifndef LINUX_ELF
-SLSUFF= .o
+DLSUFFIX= .o
LDADD_BE= -ldld
else
-SLSUFF= .so
+DLSUFFIX= .so
LDADD_BE= -ldl
LDFLAGS_BE= -rdynamic
endif
@@ -675,7 +675,7 @@ INSTALL= /usr/bin/install
RANLIB= /usr/bin/ranlib
CFLAGS_SL= -G 0
-SLSUFF= .o
+DLSUFFIX= .o
endif
diff --git a/src/mk/postgres.user.mk b/src/mk/postgres.user.mk
index 8b8c84c87f3..8adf9e05176 100644
--- a/src/mk/postgres.user.mk
+++ b/src/mk/postgres.user.mk
@@ -19,15 +19,14 @@
# values. This is a feeble attempt to provide "portable" scripts.
# _CWD_ - current working directory
# _OBJWD_ - where the generated files (eg. object files) are
-# _SLSUFF_ - suffix of the shared library or object for
-# dynamic loading
+# _DLSUFFIX_ - suffix of the dynamic loading
# _USER_ - the login of the user
#
# Copyright (c) 1994-5, Regents of the University of California
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.user.mk,v 1.1.1.1 1996/07/09 06:22:19 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/mk/Attic/postgres.user.mk,v 1.2 1996/11/18 06:07:23 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -42,7 +41,7 @@ CFLAGS+= -I$(includedir) $(CFLAGS_SL)
C=`pwd`; \
sed -e "s:_CWD_:$$C:g" \
-e "s:_OBJWD_:$$C/$(objdir):g" \
- -e "s:_SLSUFF_:$(SLSUFF):g" \
+ -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-e "s/_USER_/$$USER/g" < $*.source > $(objdir)/$*.sql
#How to create a dynamic lib
@@ -58,7 +57,7 @@ CFLAGS+= -I$(includedir) $(CFLAGS_SL)
C="`pwd`/"; \
sed -e "s:_CWD_:$$C:g" \
-e "s:_OBJWD_:$$C/$(objdir):g" \
- -e "s:_SLSUFF_:$(SLSUFF):g" \
+ -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-e "s/_USER_/$$USER/g" < $*.source > $(objdir)/$*.sh
#
@@ -71,9 +70,9 @@ endif
#
# plus shared libraries
#
-ifdef SLSUFF
-ifneq ($(SLSUFF), '.o')
-CREATEFILES+= $(DLOBJS:.so=$(SLSUFF))
+ifdef DLSUFFIX
+ifneq ($(DLSUFFIX), '.o')
+CREATEFILES+= $(DLOBJS:.so=$(DLSUFFIX))
endif
endif
diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index 8e602ba0d7a..854784fcc06 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.9 1996/11/13 10:36:17 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/test/regress/Makefile,v 1.10 1996/11/18 06:07:29 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -22,7 +22,7 @@ LDADD+= -L$(LIBPQDIR) -lpq
# DLOBJS is the dynamically-loaded object file. The regression test uses
# this when it does a CREATE FUNCTION ... LANGUAGE 'C').
#
-DLOBJS= regress$(SLSUFF)
+DLOBJS= regress$(DLSUFFIX)
#
# ... plus test query inputs
@@ -69,7 +69,7 @@ expected.out: expected.input
C="`pwd`"; \
sed -e "s:_CWD_:$$C:g" \
-e "s:_OBJWD_:$$C:g" \
- -e "s:_SLSUFF_:$(SLSUFF):g" \
+ -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-e "s/_USER_/$$USER/g" < expected.input > expected.out
@echo "YOUR EXPECTED RESULTS ARE NOW IN FILE expected.out."
@@ -81,7 +81,7 @@ expected.out: expected.input
C=`pwd`; \
sed -e "s:_CWD_:$$C:g" \
-e "s:_OBJWD_:$$C:g" \
- -e "s:_SLSUFF_:$(SLSUFF):g" \
+ -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-e "s/_USER_/$$USER/g" < $< > $@
clean:
diff --git a/src/test/regress/create.source b/src/test/regress/create.source
index 050c9a86a62..d18730aeaa0 100644
--- a/src/test/regress/create.source
+++ b/src/test/regress/create.source
@@ -9,12 +9,12 @@
CREATE FUNCTION circle_in(opaque)
RETURNS circle
- AS '_OBJWD_/regress_SLSUFF_'
+ AS '_OBJWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE FUNCTION circle_out(opaque)
RETURNS opaque
- AS '_OBJWD_/regress_SLSUFF_'
+ AS '_OBJWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE TYPE circle (
@@ -288,33 +288,33 @@ CREATE FUNCTION user_relns()
CREATE FUNCTION pt_in_circle(point, circle)
RETURNS int4
- AS '_OBJWD_/regress_SLSUFF_'
+ AS '_OBJWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE FUNCTION overpaid(emp)
RETURNS bool
- AS '_OBJWD_/regress_SLSUFF_'
+ AS '_OBJWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE FUNCTION boxarea(box)
RETURNS int4
- AS '_OBJWD_/regress_SLSUFF_'
+ AS '_OBJWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE FUNCTION interpt_pp(path, path)
RETURNS point
- AS '_OBJWD_/regress_SLSUFF_'
+ AS '_OBJWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
CREATE FUNCTION reverse_c16(char16)
RETURNS char16
- AS '_OBJWD_/regress_SLSUFF_'
+ AS '_OBJWD_/regress_DLSUFFIX_'
LANGUAGE 'c';
--
-- FUNCTION DYNAMIC LOADING
--
-LOAD '_OBJWD_/regress_SLSUFF_'
+LOAD '_OBJWD_/regress_DLSUFFIX_'
--
-- CLASS POPULATION
diff --git a/src/test/regress/expected.input b/src/test/regress/expected.input
index 6e4f4b55f36..dfc3d87982a 100644
--- a/src/test/regress/expected.input
+++ b/src/test/regress/expected.input
@@ -4,12 +4,12 @@ destroydb: database destroy failed on regression.
=============== creating new regression database... =================
QUERY: CREATE FUNCTION circle_in(opaque)
RETURNS circle
- AS '_CWD_/obj/regress_SLSUFF_'
+ AS '_CWD_/obj/regress_DLSUFFIX_'
LANGUAGE 'c';
NOTICE:ProcedureCreate: type 'circle' is not yet defined
QUERY: CREATE FUNCTION circle_out(opaque)
RETURNS opaque
- AS '_CWD_/obj/regress_SLSUFF_'
+ AS '_CWD_/obj/regress_DLSUFFIX_'
LANGUAGE 'c';
QUERY: CREATE TYPE circle (
internallength = 24,
@@ -211,25 +211,25 @@ QUERY: CREATE FUNCTION user_relns()
LANGUAGE 'sql';
QUERY: CREATE FUNCTION pt_in_circle(point, circle)
RETURNS int4
- AS '_CWD_/obj/regress_SLSUFF_'
+ AS '_CWD_/obj/regress_DLSUFFIX_'
LANGUAGE 'c';
QUERY: CREATE FUNCTION overpaid(emp)
RETURNS bool
- AS '_CWD_/obj/regress_SLSUFF_'
+ AS '_CWD_/obj/regress_DLSUFFIX_'
LANGUAGE 'c';
QUERY: CREATE FUNCTION boxarea(box)
RETURNS int4
- AS '_CWD_/obj/regress_SLSUFF_'
+ AS '_CWD_/obj/regress_DLSUFFIX_'
LANGUAGE 'c';
QUERY: CREATE FUNCTION interpt_pp(path, path)
RETURNS point
- AS '_CWD_/obj/regress_SLSUFF_'
+ AS '_CWD_/obj/regress_DLSUFFIX_'
LANGUAGE 'c';
QUERY: CREATE FUNCTION reverse_c16(char16)
RETURNS char16
- AS '_CWD_/obj/regress_SLSUFF_'
+ AS '_CWD_/obj/regress_DLSUFFIX_'
LANGUAGE 'c';
-QUERY: LOAD '_CWD_/obj/regress_SLSUFF_'
+QUERY: LOAD '_CWD_/obj/regress_DLSUFFIX_'
COPY onek FROM '_CWD_/data/onek.data';
QUERY: COPY tenk1 FROM '_CWD_/data/tenk.data';
QUERY: INSERT INTO tenk2 VALUES (tenk1.*);
diff --git a/src/tutorial/C-code/Makefile b/src/tutorial/C-code/Makefile
index 26fd5c8be4f..548bfadcfe3 100644
--- a/src/tutorial/C-code/Makefile
+++ b/src/tutorial/C-code/Makefile
@@ -3,7 +3,8 @@ include ../../Makefile.global
CFLAGS+= -I../../include -I$(LIBPQDIR)
-all: complex$(SLSUFF) funcs$(SLSUFF)
+all: complex$(DLSUFFIX) funcs$(DLSUFFIX)
clean:
- rm -f complex$(SLSUFF) funcs$(SLSUFF) \ No newline at end of file
+ rm -f complex$(DLSUFFIX) funcs$(DLSUFFIX)
+
diff --git a/src/tutorial/Makefile b/src/tutorial/Makefile
index 87b1a319df8..b463b1c11ee 100644
--- a/src/tutorial/Makefile
+++ b/src/tutorial/Makefile
@@ -4,7 +4,7 @@
# Makefile for tutorial
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.3 1996/11/13 10:36:24 bryanh Exp $
+# $Header: /cvsroot/pgsql/src/tutorial/Makefile,v 1.4 1996/11/18 06:07:52 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -19,7 +19,7 @@ LDADD+= -L$(LIBPQDIR) -lpq
# DLOBJS is the dynamically-loaded object files. The "funcs" queries
# include CREATE FUNCTIONs that load routines from these files.
#
-DLOBJS= complex$(SLSUFF) funcs$(SLSUFF)
+DLOBJS= complex$(DLSUFFIX) funcs$(DLSUFFIX)
QUERIES= advanced.sql basics.sql complex.sql funcs.sql syscat.sql
#
@@ -39,7 +39,7 @@ all: $(QUERIES)
C=`pwd`; \
sed -e "s:_CWD_:$$C:g" \
-e "s:_OBJWD_:$$C:g" \
- -e "s:_SLSUFF_:$(SLSUFF):g" \
+ -e "s:_DLSUFFIX_:$(DLSUFFIX):g" \
-e "s/_USER_/$$USER/g" < $< > $@
funcs.sql:: $(DLOBJS)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-23 12:59:07 +0000