pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

armagetronad-server: Fix install target



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jul 24 16:46:49 2016 +0200
Changeset:	73552f1abaeea6f2ff3caefab7b2a40782311337

Modified Files:
	armagetronad-server/Makefile

Log Message:
armagetronad-server: Fix install target

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=73552f1abaeea6f2ff3caefab7b2a40782311337

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 armagetronad-server/Makefile | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diffs:
diff --git a/armagetronad-server/Makefile b/armagetronad-server/Makefile
index 4efa4a2..820079c 100644
--- a/armagetronad-server/Makefile
+++ b/armagetronad-server/Makefile
@@ -13,23 +13,25 @@ CONFIGURE_ARGS+=	--enable-dedicated
 
 # pkgsrc specific handling of configuration
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+PKG_SYSCONFSUBDIR=	armagetronad-dedicated
+BUILD_DEFS+=		PKG_SYSCONFBASE
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
 INSTALL_MAKE_FLAGS+=    sysconfdir=${EGDIR}
 
-MAKE_DIRS+=	${PKG_SYSCONFDIR}/armagetronad-dedicated
-MAKE_DIRS+=	${PKG_SYSCONFDIR}/armagetronad-dedicated/examples
-MAKE_DIRS+=	${PKG_SYSCONFDIR}/armagetronad-dedicated/examples/cvs_test
+#MAKE_DIRS+=	${PKG_SYSCONFDIR}
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/examples
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/examples/cvs_test
 
 .for f in aiplayers.cfg default.cfg master.srv rc.config settings.cfg settings_authentication.cfg settings_dedicated.cfg settings_visual.cfg subcultures.srv
-CONF_FILES+=	${EGDIR}/armagetronad-dedicated/${f} ${PKG_SYSCONFDIR}/${PKGBASE}/${f}
+CONF_FILES+=	${EGDIR}/armagetronad-dedicated/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
 .for f in breakfast_in_hell.cfg death_zone.cfg fortress_soccer.cfg single_use_turbo.cfg teamsumo.cfg
-CONF_FILES+=	${EGDIR}/armagetronad-dedicated/examples/${f} ${PKG_SYSCONFDIR}/${PKGBASE}/examples/${f}
+CONF_FILES+=	${EGDIR}/armagetronad-dedicated/examples/${f} ${PKG_SYSCONFDIR}/examples/${f}
 .endfor
 
 .for f in fortress_complete.cfg fortress_physics.cfg fortress_politics.cfg fortress_scoring.cfg sumo_complete.cfg
-CONF_FILES+=	${EGDIR}/armagetronad-dedicated/examples/cvs_test/${f} ${PKG_SYSCONFDIR}/${PKGBASE}/examples/cvs_test/${f}
+CONF_FILES+=	${EGDIR}/armagetronad-dedicated/examples/cvs_test/${f} ${PKG_SYSCONFDIR}/examples/cvs_test/${f}
 .endfor
 
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index