--- Makefile.orig Sun Jul 18 15:00:26 2004 +++ Makefile Fri Jul 30 16:34:23 2004 @@ -43,12 +43,24 @@ include Makefile.bsd else +ifndef LOCALBASE + LOCALBASE=/usr/X11R6 +endif + +ifndef LOCALBASE + LOCALBASE=/usr/local +endif + +ifndef PREFIX + PREFIX=$(LOCALBASE) +endif + ROOT = -prefix = /usr/local +prefix = $(PREFIX) exec_prefix = ${prefix} bindir = $(ROOT)${exec_prefix}/bin mandir = $(ROOT)${prefix}/man/man1 -resdir = $(ROOT)/usr/X11R6/lib/X11 +resdir = $(ROOT)$(LOCALBASE)/lib/X11 # if you have perl set the path here, else just leave it alone PERL = /usr/bin/perl @@ -104,10 +116,10 @@ # The database directory can be either in the user's $HOME (or relative to any # other env variable) or at a global place like /var/spool (world-writable) # -> uncomment 2 lines below to put the databases in the user's home -#USER_DBDIR = .nxtvdb -#DEFS += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\" +USER_DBDIR = .nxtvdb +DEFS += -DEPG_DB_ENV=\"HOME\" -DEPG_DB_DIR=\"$(USER_DBDIR)\" ifndef USER_DBDIR -SYS_DBDIR = /usr/tmp/nxtvdb +SYS_DBDIR = /var/tmp/nxtvdb DEFS += -DEPG_DB_DIR=\"$(SYS_DBDIR)\" INST_DB_DIR = $(ROOT)$(SYS_DBDIR) INST_DB_PERM = 0777 @@ -121,7 +133,7 @@ CFLAGS += $(WARN) $(INCS) $(DEFS) #LDLIBS += -pg -BUILD_DIR = build-$(shell uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/') +BUILD_DIR ?= build-$(shell uname -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/') INCS += -I$(BUILD_DIR) # end Linux specific part