diff options
-rw-r--r-- | comms/jpilot-syncmal/Makefile | 16 | ||||
-rw-r--r-- | comms/jpilot-synctime/Makefile | 13 |
2 files changed, 17 insertions, 12 deletions
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile index 69b32237f37..e77bbb0960b 100644 --- a/comms/jpilot-syncmal/Makefile +++ b/comms/jpilot-syncmal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/03/02 17:38:09 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2001/06/22 06:20:28 jlam Exp $ DISTNAME= jpilot-syncmal_0.60 PKGNAME= jpilot-syncmal-0.60 @@ -13,6 +13,9 @@ COMMENT= MAL synchronization plugin for J-Pilot DEPENDS+= jpilot>=0.99:../../comms/jpilot +USE_BUILDLINK_ONLY= # defined +USE_CONFIG_WRAPPER= # defined + GNU_CONFIGURE= # defined USE_X11= # defined USE_GMAKE= # defined @@ -22,17 +25,16 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins PLIST_SUBST+= PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///} -EVAL_PREFIX+= GTKDIR=gtk+ -EVAL_PREFIX+= JPILOTDIR=jpilot -EVAL_PREFIX+= PILOTLINKDIR=pilot-link -CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" +CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_DIR}" CONFIGURE_ARGS+= --with-mal-source="${WRKSRC}/../malsync" -CONFIGURE_ARGS+= --with-plugin-prefix="${JPILOTDIR}/include/jpilot" -CONFIGURE_ARGS+= --with-pilot-prefix="${PILOTLINKDIR}" +CONFIGURE_ARGS+= --with-plugin-prefix="${BUILDLINK_DIR}/include/jpilot" +CONFIGURE_ARGS+= --with-pilot-prefix="${BUILDLINK_DIR}" CFLAGS+= -D__unix__=1 do-install: ${INSTALL_DATA} ${WRKSRC}/.libs/libsyncmal.so ${PLUGINSDIR} +.include "../../comms/jpilot/buildlink.mk" +.include "../../comms/pilot-link/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/comms/jpilot-synctime/Makefile b/comms/jpilot-synctime/Makefile index 34a05202237..dedb6186077 100644 --- a/comms/jpilot-synctime/Makefile +++ b/comms/jpilot-synctime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/01 20:40:32 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2001/06/22 06:12:01 jlam Exp $ DISTNAME= jpilot-0.99 PKGNAME= jpilot-synctime-0.99 @@ -12,14 +12,15 @@ COMMENT= Time synchronization plugin for J-Pilot DEPENDS+= jpilot>=0.99:../../comms/jpilot +USE_BUILDLINK_ONLY= # defined +USE_CONFIG_WRAPPER= # defined + USE_X11= # defined USE_LIBTOOL= # defined GNU_CONFIGURE= # defined -EVAL_PREFIX+= GTKDIR=gtk+ -EVAL_PREFIX+= PILOTLINKDIR=pilot-link -CONFIGURE_ARGS+= --with-gtk-prefix="${GTKDIR}" -CONFIGURE_ARGS+= --with-pilot-prefix="${PILOTLINKDIR}" +CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_DIR}" +CONFIGURE_ARGS+= --with-pilot-prefix="${BUILDLINK_DIR}" PLUGINSDIR= ${PREFIX}/lib/jpilot/plugins PLIST_SUBST+= PLUGINSDIR=${PLUGINSDIR:S/${PREFIX}\///} @@ -28,4 +29,6 @@ post-extract: ${RM} -f ${WRKSRC}/../libtool ${LN} -sf ${LIBTOOL} ${WRKSRC}/../libtool +.include "../../comms/jpilot/buildlink.mk" +.include "../../comms/pilot-link/buildlink.mk" .include "../../mk/bsd.pkg.mk" |