summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>1998-02-18 17:48:14 +0000
committeragc <agc@pkgsrc.org>1998-02-18 17:48:14 +0000
commit71fe6dc6c2a730dd56830832d7bbb0f8987cf205 (patch)
tree31ba5658f5f6fdea84e7208184947123f8f83a21 /databases
parented95ebef701557580801661cb1d92a3b24c1d97d (diff)
downloadpkgsrc-71fe6dc6c2a730dd56830832d7bbb0f8987cf205.tar.gz
Build the libpgtcl shared object properly.
Add pgaccess to the list of programs to 'do' when USE_TCL is defined. Add a Makefile for pgaccess, so that it gets installed with the right embedded interpreter.
Diffstat (limited to 'databases')
-rw-r--r--databases/postgresql/patches/patch-af30
1 files changed, 24 insertions, 6 deletions
diff --git a/databases/postgresql/patches/patch-af b/databases/postgresql/patches/patch-af
index 17fa9b470ce..74dfc9428b9 100644
--- a/databases/postgresql/patches/patch-af
+++ b/databases/postgresql/patches/patch-af
@@ -15,21 +15,21 @@
ifeq ($(PORTNAME), i386_solaris)
CFLAGS+= -fPIC
endif
-@@ -56,10 +64,10 @@
+@@ -56,10 +64,9 @@
endif
$(RANLIB) libpgtcl.a
-libpgtcl.so.1: $(OBJS)
- $(CC) $(LDFLAGS) -shared $(OBJS) -o libpgtcl.so.1
-+libpgtcl.so.1.0: $(OBJS)
-+ $(CC) $(LDFLAGS) -shared $(OBJS) -o libpgtcl.so.1.0
- rm -f libpgtcl.so
+- rm -f libpgtcl.so
- ln -s libpgtcl.so.1 libpgtcl.so
-+ ln -s libpgtcl.so.1.0 libpgtcl.so
++$(shlib): $(OBJS)
++ $(LD) $(LDFLAGS_SL) -o $@ $(OBJS)
++ ln -sf libpgtcl.so.1.0 libpgtcl.so
.PHONY: beforeinstall-headers install-headers
.PHONY: install install-libpgtcl
-@@ -75,11 +83,11 @@
+@@ -75,11 +82,11 @@
install-libpgtcl: libpgtcl.a
$(INSTALL) $(INSTL_LIB_OPTS) libpgtcl.a $(DESTDIR)$(LIBDIR)/libpgtcl.a
@@ -45,3 +45,21 @@
.PHONY: clean
clean:
+--- bin/Makefile 1998/02/18 15:50:27 1.1
++++ bin/Makefile 1998/02/18 15:50:40
+@@ -36,4 +36,5 @@
+ #
+ ifeq ($(USE_TCL), true)
+ $(MAKE) -C pgtclsh $@
++ $(MAKE) -C pgaccess $@
+ endif
+--- /dev/null Wed Feb 18 15:53:20 1998
++++ bin/pgaccess/Makefile Wed Feb 18 16:12:13 1998
+@@ -0,0 +1,7 @@
++BIN=${PREFIX}/pgsql/bin/pgaccess
++
++all: ;
++
++install:
++ sed -e 's|^#!/usr/bin/wish|#! '${PREFIX}'/pgsql/bin/pgtksh -f|' < pgaccess.tcl > ${BIN}
++ chmod 755 ${BIN}