summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authordarcy <darcy@pkgsrc.org>2000-02-25 22:32:33 +0000
committerdarcy <darcy@pkgsrc.org>2000-02-25 22:32:33 +0000
commit0eb27cdf5ccf8bbe6ed1379ec3e0dc50b7287fc8 (patch)
treec28aefb76b4bfab746f40d6d556b9d88ef857b16 /databases
parentc6d48400c0077842d87373784043fedec0e358f6 (diff)
downloadpkgsrc-0eb27cdf5ccf8bbe6ed1379ec3e0dc50b7287fc8.tar.gz
Seem that I was a bit hasty with the previous change. This backs out
that change and makes the correct one which is to simply remove the -Wl flag as cc can handle -R by itself.
Diffstat (limited to 'databases')
-rw-r--r--databases/py-postgresql/Makefile10
-rw-r--r--databases/py-postgresql/files/Setup.in4
2 files changed, 5 insertions, 9 deletions
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index 7b30373b7b7..4719de98ab6 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/02/24 22:41:01 darcy Exp $
+# $NetBSD: Makefile,v 1.4 2000/02/25 22:32:33 darcy Exp $
DISTNAME= PyGreSQL-2.4
PKGNAME= py-postgresql-2.4
@@ -24,12 +24,8 @@ PGUSER?= pgsql
PGPREFIX= ${LOCALBASE}/${PGUSER} # PostgreSQL home directory
do-configure:
- if echo __ELF__ | ${CC} -E - | grep -q __ELF__; \
- then ${SED} -e "s+@PGPREFIX@+${PGPREFIX}+g;s+@WLFLAG@++g" \
- ${FILESDIR}/Setup.in > ${WRKSRC}/Setup.in; \
- else ${SED} -e "s+@PGPREFIX@+${PGPREFIX}+g;s+@WLFLAG@+-Wl,+" \
- ${FILESDIR}/Setup.in > ${WRKSRC}/Setup.in; \
- fi
+ ${SED} -e "s,@PGPREFIX@,${PGPREFIX},g" \
+ ${FILESDIR}/Setup.in > ${WRKSRC}/Setup.in
${CP} ${PYTHON_LIBDIR}/config/Makefile.pre.in ${WRKSRC}
cd ${WRKSRC}; ${MAKE} -f Makefile.pre.in boot
diff --git a/databases/py-postgresql/files/Setup.in b/databases/py-postgresql/files/Setup.in
index 5567e12d283..e191d36d2a2 100644
--- a/databases/py-postgresql/files/Setup.in
+++ b/databases/py-postgresql/files/Setup.in
@@ -1,4 +1,4 @@
-# $NetBSD: Setup.in,v 1.3 2000/02/24 22:41:02 darcy Exp $
+# $NetBSD: Setup.in,v 1.4 2000/02/25 22:32:34 darcy Exp $
#
*shared*
-_pg pgmodule.c -I@PGPREFIX@/include @WLFLAG@-R@PGPREFIX@/lib -L@PGPREFIX@/lib -lpq -lcrypt -DNO_DIRECT
+_pg pgmodule.c -I@PGPREFIX@/include -R@PGPREFIX@/lib -L@PGPREFIX@/lib -lpq -lcrypt -DNO_DIRECT