Move fix for swig/bool mess to Makefile.common.

With this, amanda-client, amanda-server and amanda-plot also build.
This commit is contained in:
gdt 2014-06-10 15:51:37 +00:00
parent bef8522f0e
commit 127f0fc750
2 changed files with 8 additions and 8 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.66 2014/06/09 21:07:01 joerg Exp $
# $NetBSD: Makefile,v 1.67 2014/06/10 15:51:37 gdt Exp $
PKGNAME= amanda-common-${AMANDA_VERSION}
PKGREVISION= 6
@ -33,10 +33,4 @@ REQD_FILES_PERMS+= /dev/null ${AMANDA_VAR}/amandates ${AMANDA_USER} ${AMANDA_GRO
SPECIAL_PERMS+= sbin/amservice ${AM_PROG_PERMS}
SUBST_CLASSES+= bool
SUBST_MESSAGE.bool= Fix SWIG messing with stdbool.h.
SUBST_STAGE.bool= post-patch
SUBST_FILES.bool= perl/Amanda/*.c perl/Amanda/*/*.c
SUBST_SED.bool= -e '/undef bool/d'
.include "../../mk/bsd.pkg.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.38 2013/01/23 17:58:19 wiz Exp $
# $NetBSD: Makefile.common,v 1.39 2014/06/10 15:51:37 gdt Exp $
# used by sysutils/amanda-common/Makefile
# used by sysutils/amanda-client/Makefile
@ -52,6 +52,12 @@ BUILD_DEPENDS+= gettext-tools-[0-9]*:../../devel/gettext-tools
PERL5_CONFIGURE= no
AUTO_MKDIRS= yes
SUBST_CLASSES+= bool
SUBST_MESSAGE.bool= Fix SWIG messing with stdbool.h.
SUBST_STAGE.bool= post-patch
SUBST_FILES.bool= perl/Amanda/*.c perl/Amanda/*/*.c
SUBST_SED.bool= -e '/undef bool/d'
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q}