diff options
| author | jlam <jlam> | 2002-07-30 02:15:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-07-30 02:15:42 +0000 |
| commit | 6a70b20e03023d9e52524698f50e39e8507fbfdc (patch) | |
| tree | 8823b30d82586e9b2f7910efc434e2ea7b3f145c | |
| parent | 2c594d76768ff27db16cdae7ab919fdec6e5e515 (diff) | |
| download | pkgsrc-6a70b20e03023d9e52524698f50e39e8507fbfdc.tar.gz | |
Fix error in creation of the freetype-config wrapper script. Now, we
generate the wrapper if the original config scripts exists, otherwise we
create our own config script freom buildlink-freetype-config.in.
| -rw-r--r-- | graphics/freetype2/buildlink.mk | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk index 8849ac95c7b..2a2ffd15124 100644 --- a/graphics/freetype2/buildlink.mk +++ b/graphics/freetype2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.14 2002/06/26 05:40:33 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.15 2002/07/30 02:15:42 jlam Exp $ # # This Makefile fragment is included by packages that use freetype2. # @@ -52,36 +52,14 @@ BUILDLINK_FILES.freetype2+= lib/libfreetype.* BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.freetype2} BUILDLINK_TARGETS.freetype2= freetype2-buildlink +BUILDLINK_TARGETS.freetype2+= freetype2-buildlink-config-wrapper +BUILDLINK_TARGETS.freetype2+= freetype2-buildlink-config -.if ${_NEED_FREETYPE2} == "YES" -BUILDLINK_TARGETS.freetype2+= freetype2-buildlink-config-wrapper BUILDLINK_CONFIG.freetype2= \ ${BUILDLINK_PREFIX.freetype2}/bin/freetype-config BUILDLINK_CONFIG_WRAPPER.freetype2= \ ${BUILDLINK_DIR}/bin/freetype-config -freetype2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE - -.else -BUILDLINK_TARGETS.freetype2+= freetype2-buildlink-config -BUILDLINK_CONFIG.freetype2= ${BUILDLINK_DIR}/bin/freetype-config -BUILDLINK_CONFIG_WRAPPER.freetype2= ${BUILDLINK_CONFIG.freetype2} - -freetype2-buildlink-config: - ${_PKG_SILENT}${_PKG_DEBUG} \ - if [ ! -f ${BUILDLINK_CONFIG.freetype2} ]; then \ - ${ECHO_BUILDLINK_MSG} "Creating config script ${BUILDLINK_CONFIG.freetype2}."; \ - ${MKDIR} ${BUILDLINK_CONFIG.freetype2:H}; \ - ${SED} -e "s|@AWK@|${AWK}|g" \ - -e "s|@SED@|${SED}|g" \ - -e "s|@X11BASE@|${X11BASE}|g" \ - -e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g" \ - ${.CURDIR}/../../graphics/freetype2/buildlink-freetype-config.in \ - > ${BUILDLINK_CONFIG.freetype2}; \ - ${CHMOD} +x ${BUILDLINK_CONFIG.freetype2}; \ - fi -.endif # _NEED_FREETYPE2 - REPLACE_BUILDLINK_SED+= \ -e "s|${BUILDLINK_CONFIG_WRAPPER.freetype2}|${BUILDLINK_CONFIG.freetype2}|g" @@ -93,5 +71,20 @@ MAKE_ENV+= FREETYPE_CONFIG="${FREETYPE_CONFIG}" pre-configure: ${BUILDLINK_TARGETS.freetype2} freetype2-buildlink: _BUILDLINK_USE +freetype2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE + +freetype2-buildlink-config: + ${_PKG_SILENT}${_PKG_DEBUG} \ + if [ ! -f ${BUILDLINK_CONFIG_WRAPPER.freetype2} ]; then \ + ${ECHO_BUILDLINK_MSG} "Creating config script ${BUILDLINK_CONFIG_WRAPPER.freetype2}."; \ + ${MKDIR} ${BUILDLINK_CONFIG_WRAPPER.freetype2:H}; \ + ${SED} -e "s|@AWK@|${AWK}|g" \ + -e "s|@SED@|${SED}|g" \ + -e "s|@X11BASE@|${X11BASE}|g" \ + -e "s|@BUILDLINK_DIR@|${BUILDLINK_DIR}|g" \ + ${.CURDIR}/../../graphics/freetype2/buildlink-freetype-config.in \ + > ${BUILDLINK_CONFIG_WRAPPER.freetype2}; \ + ${CHMOD} +x ${BUILDLINK_CONFIG_WRAPPER.freetype2}; \ + fi .endif # FREETYPE2_BUILDLINK_MK |