. Use ${DATADIR} consistently instead fo sometimes using

${PREFIX}/share/slashem

Submitted by:	sat@ (although this is a slightly different implementation)
This commit is contained in:
Greg Lewis 2007-08-25 18:09:49 +00:00
parent d29c72cbce
commit e9b36c2745
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=198299
6 changed files with 8 additions and 6 deletions

View file

@ -22,10 +22,11 @@ SUB_FILES+= pkg-deinstall
MAN6= dgn_comp.6 dlb.6 lev_comp.6 recover.6 slashem.6
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([A-Z])./\1/g}
MAKE_ENV+= DATADIR="${DATADIR}"
post-patch:
${REINPLACE_CMD} -e \
"s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/include/config.h
"s@%%DATADIR%%@${DATADIR}@g" ${WRKSRC}/include/config.h
pre-configure:
@cd ${WRKSRC}/sys/unix; ${SH} setup.sh

View file

@ -33,7 +33,7 @@ $FreeBSD$
# define HACKDIR "nethackdir" /* nethack directory */
# else
-# define HACKDIR "."
+# define HACKDIR "%%PREFIX%%/share/slashem" /* nethack directory */
+# define HACKDIR "%%DATADIR%%" /* nethack directory */
# endif
# endif

View file

@ -32,7 +32,7 @@ $FreeBSD$
# Defs. for non file areas support.
-GAMEDIR = $(PREFIX)/local/slashemdir
+GAMEDIR = $(PREFIX)/share/${GAME}
+GAMEDIR = $(DATADIR)
VARDIR = $(GAMEDIR)
FILE_AREA_VAR = $(VARDIR)
FILE_AREA_SAVE = $(VARDIR)/save

View file

@ -22,10 +22,11 @@ SUB_FILES+= pkg-deinstall
MAN6= dgn_comp.6 dlb.6 lev_comp.6 recover.6 slashem.6
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([A-Z])./\1/g}
MAKE_ENV+= DATADIR="${DATADIR}"
post-patch:
${REINPLACE_CMD} -e \
"s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/include/config.h
"s@%%DATADIR%%@${DATADIR}@g" ${WRKSRC}/include/config.h
pre-configure:
@cd ${WRKSRC}/sys/unix; ${SH} setup.sh

View file

@ -33,7 +33,7 @@ $FreeBSD$
# define HACKDIR "nethackdir" /* nethack directory */
# else
-# define HACKDIR "."
+# define HACKDIR "%%PREFIX%%/share/slashem" /* nethack directory */
+# define HACKDIR "%%DATADIR%%" /* nethack directory */
# endif
# endif

View file

@ -32,7 +32,7 @@ $FreeBSD$
# Defs. for non file areas support.
-GAMEDIR = $(PREFIX)/local/slashemdir
+GAMEDIR = $(PREFIX)/share/${GAME}
+GAMEDIR = $(DATADIR)
VARDIR = $(GAMEDIR)
FILE_AREA_VAR = $(VARDIR)
FILE_AREA_SAVE = $(VARDIR)/save