Change the way the configure script is executed and included in order
to make dependencies work. Call the script pre-fetch and include Makefile.inc AFTER it has been created. Reported by: Disturbed FreeBSD newbie who couldn't figure out why this didn't work as expected.
This commit is contained in:
parent
71f287b5da
commit
1f4300a57a
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=43014
14 changed files with 70 additions and 70 deletions
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
|
@ -87,11 +87,7 @@ SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \
|
|||
NO_OPENSSL="${NO_OPENSSL}" \
|
||||
DISTNAME="${DISTNAME}"
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
pre-extract:
|
||||
pre-fetch:
|
||||
@ ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postgresql
|
||||
|
||||
pre-install:
|
||||
|
@ -190,4 +186,8 @@ post-clean:
|
|||
|
||||
post-extract: ${POSTEXTRACT}
|
||||
|
||||
.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
|
||||
.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
|
Loading…
Reference in a new issue