summaryrefslogtreecommitdiff
path: root/databases/postgresql
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-05-15 19:24:27 +0000
committerjlam <jlam@pkgsrc.org>2001-05-15 19:24:27 +0000
commitc755567e002b45d058108e433db8bac207d0f297 (patch)
tree2a7054d3f0be4c990119fcffefe21f10e5685388 /databases/postgresql
parent3650011653bcd6d0aff19ae1971187a06b861277 (diff)
downloadpkgsrc-c755567e002b45d058108e433db8bac207d0f297.tar.gz
Move Makefile.getopt to pkgsrc/devel/libgetopt and cosmetic updates
to Makefile.readline.
Diffstat (limited to 'databases/postgresql')
-rw-r--r--databases/postgresql/Makefile.getopt21
-rw-r--r--databases/postgresql/Makefile.readline6
2 files changed, 3 insertions, 24 deletions
diff --git a/databases/postgresql/Makefile.getopt b/databases/postgresql/Makefile.getopt
deleted file mode 100644
index 1c45b7edda0..00000000000
--- a/databases/postgresql/Makefile.getopt
+++ /dev/null
@@ -1,21 +0,0 @@
-# $NetBSD: Makefile.getopt,v 1.1 2001/05/14 14:52:36 jlam Exp $
-#
-# This Makefile fragment is included by PostgreSQL packages built from the
-# main sources of the PostgreSQL distribution that use getopt_long()
-# functionality.
-
-.if exists(/usr/include/getopt.h)
-GETOPT_H= /usr/include/getopt.h
-.else
-GETOPT_H= ${LOCALBASE}/include/getopt.h
-DEPENDS+= libgetopt>=1.3:../../devel/libgetopt
-LIBS+= -lgetopt
-.endif
-
-# This target links the getopt header into ${WRKINCDIR}/include, which is
-# searched first by the C preprocessor.
-#
-link-getopt-headers:
- ${MKDIR} -p ${WRKINCDIR}
- ${RM} -f ${WRKINCDIR}/getopt.h
- ${LN} -sf ${GETOPT_H} ${WRKINCDIR}
diff --git a/databases/postgresql/Makefile.readline b/databases/postgresql/Makefile.readline
index 5caab60387d..e15e0de323d 100644
--- a/databases/postgresql/Makefile.readline
+++ b/databases/postgresql/Makefile.readline
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile.readline,v 1.1 2001/05/14 14:52:36 jlam Exp $
+# $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.
-CONFIGURE_ARGS+= --enable-readline
-
.if exists(/usr/include/readline.h)
READLINE_H= /usr/include/readline.h
HISTORY_H= /usr/include/history.h
@@ -20,6 +18,8 @@ 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.
#