linux hints file and xset bugfix (trunk only)
Add a hints file for an ubuntu tty build and skip xset if no fonts.dir file exists (this test will probably need another tweak, but I need a linux x11 build first to test it).
This commit is contained in:
@@ -0,0 +1,26 @@
|
|||||||
|
#
|
||||||
|
# SCCS Id: @(#)linux 3.5 2007/12/15
|
||||||
|
# Copyright (c) Kenneth Lorber, Kensington, Maryland, 2007.
|
||||||
|
# NetHack may be freely redistributed. See license for details.
|
||||||
|
#
|
||||||
|
# Linux hints file
|
||||||
|
# This hints file provides a single-user tty build for Linux, specifically
|
||||||
|
# for Ubuntu dapper.
|
||||||
|
|
||||||
|
|
||||||
|
HACKDIR=$(PREFIX)/games/lib/$(GAME)dir
|
||||||
|
#PREFIX=/usr
|
||||||
|
PREFIX=$(wildcard ~)/nh/install
|
||||||
|
|
||||||
|
CFLAGS=-O -I../include -DNOTPARMDECL $(CFLAGS1)
|
||||||
|
CFLAGS1=-DCOMPRESS=\"/bin/gzip\" -DCOMPRESS_EXTENSION=\".gz\"
|
||||||
|
|
||||||
|
|
||||||
|
WINSRC = $(WINTTYSRC)
|
||||||
|
WINOBJ = $(WINTTYOBJ)
|
||||||
|
WINLIB = $(WINTTYLIB)
|
||||||
|
|
||||||
|
WINTTYLIB=-lcurses
|
||||||
|
|
||||||
|
CHOWN=true
|
||||||
|
CHGRP=true
|
||||||
+1
-1
@@ -16,7 +16,7 @@ esac
|
|||||||
export XUSERFILESEARCHPATH
|
export XUSERFILESEARCHPATH
|
||||||
|
|
||||||
# Get font dir added, but only once (and only if there's an xset to be found).
|
# Get font dir added, but only once (and only if there's an xset to be found).
|
||||||
xset p >/dev/null 2>&1 && (
|
test -e $HACKDIR/fonts.dir && xset p >/dev/null 2>&1 && (
|
||||||
xset fp- $HACKDIR >/dev/null 2>&1;
|
xset fp- $HACKDIR >/dev/null 2>&1;
|
||||||
xset fp+ $HACKDIR
|
xset fp+ $HACKDIR
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user