summaryrefslogtreecommitdiff
path: root/sysutils/amanda-common
diff options
context:
space:
mode:
authorsbd <sbd@pkgsrc.org>2012-07-30 07:00:12 +0000
committersbd <sbd@pkgsrc.org>2012-07-30 07:00:12 +0000
commit4190af5924affdb50a18f80ae3eb62ecc0863523 (patch)
tree7714f23e5ec913ffdc915fe56c94ca03797dd44b /sysutils/amanda-common
parenta30908ef4452999b93702a9b67a5657669971d53 (diff)
downloadpkgsrc-4190af5924affdb50a18f80ae3eb62ecc0863523.tar.gz
Miscellaneous makefile clean up.
Diffstat (limited to 'sysutils/amanda-common')
-rw-r--r--sysutils/amanda-common/Makefile8
-rw-r--r--sysutils/amanda-common/Makefile.common17
2 files changed, 10 insertions, 15 deletions
diff --git a/sysutils/amanda-common/Makefile b/sysutils/amanda-common/Makefile
index 33a311eee0d..cd8e25b7f80 100644
--- a/sysutils/amanda-common/Makefile
+++ b/sysutils/amanda-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2012/07/30 06:57:21 sbd Exp $
+# $NetBSD: Makefile,v 1.51 2012/07/30 07:00:12 sbd Exp $
PKGNAME= amanda-common-${AMANDA_VERSION}
SVR4_PKGNAME= amaco
@@ -8,12 +8,9 @@ COMMENT= Common libraries and binaries for Amanda
PKG_DESTDIR_SUPPORT= user-destdir
-.include "../../mk/bsd.prefs.mk"
.include "../../sysutils/amanda-common/Makefile.common"
-.if ${OPSYS} == "NetBSD"
-CPPFLAGS= # empty
-.elif ${OPSYS} == "SunOS"
+.if ${OPSYS} == "SunOS"
CPPFLAGS+= -D_LARGEFILE64_SOURCE
.endif
@@ -35,7 +32,6 @@ PKG_SHELL.${AMANDA_USER}= ${SH}
OWN_DIRS_PERMS= ${AMANDA_VAR} ${AMANDA_USER} ${AMANDA_GROUP} 0700
OWN_DIRS_PERMS+= ${AMANDA_VAR}/gnutar-lists ${AMANDA_USER} ${AMANDA_GROUP} 0700
-BUILD_DEFS+= AMANDA_VAR
INSTALL_MAKE_FLAGS+= SETUID_GROUP=${ROOT_GROUP}
diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common
index d31f37a0202..5c2b80e2066 100644
--- a/sysutils/amanda-common/Makefile.common
+++ b/sysutils/amanda-common/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2012/07/30 06:57:21 sbd Exp $
+# $NetBSD: Makefile.common,v 1.33 2012/07/30 07:00:12 sbd Exp $
# used by sysutils/amanda-common/Makefile
# used by sysutils/amanda-client/Makefile
@@ -31,24 +31,23 @@ AMANDA_VAR?= ${VARBASE}/amanda
PKG_GROUPS_VARS+= AMANDA_GROUP
PKG_USERS_VARS+= AMANDA_USER
-BUILD_DEFS+= AMANDA_TMP AMANDA_VAR VARBASE
+BUILD_DEFS+= AMANDA_TMP AMANDA_USER AMANDA_GROUP AMANDA_VAR VARBASE
USE_LIBTOOL= yes
-
USE_TOOLS+= gzip:run gtar:run
-CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
-CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q}
GNU_CONFIGURE= yes
+CONFIGURE_ENV+= ac_cv_path_GZIP=${TOOLS_GZIP_CMD:Q}
+CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q}
+CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q}
+CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR:Q}/gnutar-lists
CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q}
CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP:Q}
CONFIGURE_ARGS+= --with-owner=${REAL_ROOT_USER:Q}
CONFIGURE_ARGS+= --with-mmap
CONFIGURE_ARGS+= --with-amandahosts
-CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q}
-CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q}
-CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists
CONFIGURE_ARGS+= --with-dump-honor-nodump
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
.include "../../sysutils/amanda-common/options.mk"