summaryrefslogtreecommitdiff
path: root/databases/postgresql
diff options
context:
space:
mode:
authorjlam <jlam>2001-05-16 05:28:55 +0000
committerjlam <jlam>2001-05-16 05:28:55 +0000
commitf48090bccb9fdd99a3351097ee8aabb195e0f043 (patch)
tree0cabf54144e1bbc1a2935d2383264e5ccd850dda /databases/postgresql
parent22216b27c72ba1842903163b56f06faee9db9bb7 (diff)
downloadpkgsrc-f48090bccb9fdd99a3351097ee8aabb195e0f043.tar.gz
Adapt postgresql-client to use devel/readline/Makefile.readline instead
of the one in databases/postgresql. Remove the Makefile.readline in databases/postgresql as it's no longer used by any packages.
Diffstat (limited to 'databases/postgresql')
-rw-r--r--databases/postgresql/Makefile.common12
-rw-r--r--databases/postgresql/Makefile.readline31
2 files changed, 10 insertions, 33 deletions
diff --git a/databases/postgresql/Makefile.common b/databases/postgresql/Makefile.common
index 1cbd9814335..009668fc21e 100644
--- a/databases/postgresql/Makefile.common
+++ b/databases/postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2001/05/15 15:59:22 jlam Exp $
+# $NetBSD: Makefile.common,v 1.15 2001/05/16 05:28:55 jlam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution.
@@ -80,11 +80,19 @@ CONFIGURE_ENV+= LIBS="${LIBS}"
MAKE_ENV+= CUSTOM_COPT="${CFLAGS}"
WRKINCDIR= ${WRKDIR}/include
+WRKLIBDIR= ${WRKDIR}/lib
CPPFLAGS+= -I${WRKINCDIR}
CFLAGS+= -I${WRKINCDIR}
+LDFLAGS+= -L${WRKLIBDIR}
+
+# The following is a hack to force ${WRKLIBDIR} to the front of the linker's
+# library search path without having to patch a lot of Makefile. It works
+# because the PostgreSQL Makefiles invoke the linker with $(CFLAGS) as well.
+#
+CFLAGS+= -L${WRKLIBDIR}
post-extract:
- ${MKDIR} -p ${WRKINCDIR}
+ ${MKDIR} -p ${WRKINCDIR} ${WRKLIBDIR}
if [ -d ${WRKSRC}/src ]; then \
${RM} -f ${WRKSRC}/src/Makefile.custom; \
${CP} -f ${COMMON_FILESDIR}/Makefile.custom \
diff --git a/databases/postgresql/Makefile.readline b/databases/postgresql/Makefile.readline
deleted file mode 100644
index e15e0de323d..00000000000
--- a/databases/postgresql/Makefile.readline
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD: Makefile.readline,v 1.2 2001/05/15 19:24:27 jlam Exp $
-#
-# This Makefile fragment is included by PostgreSQL packages built from the
-# main sources of the PostgreSQL distribution that use readline()
-# functionality.
-
-.if exists(/usr/include/readline.h)
-READLINE_H= /usr/include/readline.h
-HISTORY_H= /usr/include/history.h
-CONFIGURE_ENV+= pgac_cv_check_readline="-ledit -ltermcap"
-.elif exists(/usr/include/readline/readline.h)
-READLINE_H= /usr/include/readline/readline.h
-HISTORY_H= /usr/include/readline/history.h
-CONFIGURE_ENV+= pgac_cv_check_readline="-ledit -ltermcap"
-.else
-READLINE_H= ${LOCALBASE}/readline/readline.h
-HISTORY_H= ${LOCALBASE}/readline/history.h
-DEPENDS+= readline>=4.0:../../devel/readline
-.endif
-
-WRKINCDIR?= ${WRKDIR}/include
-
-# This target links the readline and history headers into
-# ${WRKINCDIR}/include, which is searched first by the C preprocessor.
-#
-link-readline-headers:
- ${MKDIR} -p ${WRKINCDIR}/readline
- ${RM} -f ${WRKINCDIR}/readline/readline.h
- ${RM} -f ${WRKINCDIR}/readline/history.h
- ${LN} -sf ${READLINE_H} ${WRKINCDIR}/readline
- ${LN} -sf ${HISTORY_H} ${WRKINCDIR}/readline