summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authorgdt <gdt@pkgsrc.org>2014-06-10 15:51:37 +0000
committergdt <gdt@pkgsrc.org>2014-06-10 15:51:37 +0000
commit3b1e07b33785bc2bde68ff484dc013c0f8881844 (patch)
tree0d5be14b643f7a668a629e9d83f933a2414271e4 /sysutils
parent9611c157d010938e53b1714e3f7f317facf558c0 (diff)
downloadpkgsrc-3b1e07b33785bc2bde68ff484dc013c0f8881844.tar.gz
Move fix for swig/bool mess to Makefile.common.
With this, amanda-client, amanda-server and amanda-plot also build.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/amanda-common/Makefile8
-rw-r--r--sysutils/amanda-common/Makefile.common8
2 files changed, 8 insertions, 8 deletions
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index dc93e55f1e2..5339bba41b7 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -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"
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index 8c186601ba2..4ac4207877e 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -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}