$NetBSD: patch-aa,v 1.6 2011/05/23 12:05:54 obache Exp $

--- Imakefile.orig	1999-11-22 14:06:25.000000000 +0000
+++ Imakefile
@@ -69,7 +69,7 @@ XCOMM
 /* #define thefont "-*-courier-*-r-*-*-18-*-*-*-m-*-*-*" */
 XCOMM where is the high score file?
 XCOMM SCORE = $(LOCAL)/lib/$(APP)
-SCORE = /var/lib/games/$(APP)
+SCORE = @VARBASE@/games/$(APP)
 /* to install default gardens not in app_defaults/$(APP)
 /* #define InstallDefaultGardens $(SCORE)/gardens */
 
@@ -82,7 +82,7 @@ XCOMM STD_INCLUDES = -I/usr/include/mit
 XCOMM and they require these two libraries changed
 XCOMM XLIB = -lXext-mit -lX11-mit
 XCOMM required for setuid, try one or the other, (the first is better)
-XCOMM EXTRA_LOAD_FLAGS = -R$(USRLIBDIR)$${LD_RUN_PATH+\:$$LD_RUN_PATH}
+XCOMM EXTRA_LOAD_FLAGS = -Wl,-R$(USRLIBDIR)$${LD_RUN_PATH+\:$$LD_RUN_PATH}
 XCOMM EXTRA_LOAD_FLAGS = -static
 XCOMM some X implementations and openwindows require the maths library
 XCOMM MATHSLIB = -lm
@@ -91,9 +91,9 @@ XCOMM install parameters
 XCOMM
 XCOMM owner and access rights for executable & score directory
 XCOMM these are set for a setuid xmris
-OWNER = -o games
-INSTSCOREFLAGS = $(OWNER) -m 755
-INSTMRISFLAGS = $(OWNER) $(INSTUIDFLAGS)
+OWNER = 
+INSTSCOREFLAGS = 
+INSTMRISFLAGS = $(INSTBINFLAGS)
 XCOMM normal install locations
 THEBINDIR = $(BINDIR)
 THEMANDIR = $(MANDIR)
@@ -238,9 +238,9 @@ NormalProgramTarget(xmris,$(MRISOBJS),$(
 
 InstallProgramWithFlags(xmris,$(THEBINDIR),$(INSTMRISFLAGS))
 
-install :: $(THEBINDIR)/xmris
-	$(RM) $(THEBINDIR)/xmsit
-	$(LN) ./xmris $(THEBINDIR)/xmsit
+install :: $(DESTDIR)$(THEBINDIR)/xmris
+	$(RM) $(DESTDIR)$(THEBINDIR)/xmsit
+	$(LN) ./xmris $(DESTDIR)$(THEBINDIR)/xmsit
 
 XCOMM xmred build
 NormalProgramTarget(xmred,$(MREDOBJS) $(WIDGETOBJS),$(DEPLIBS),$(LOCAL_LIBRARIES) -lm,)
@@ -270,16 +270,16 @@ Xmris.ad : Xmris-ad.src
 
 XCOMM score directory install
 install ::
-	MakeDir($(SCORE))
+	MakeDir($(DESTDIR)$(SCORE))
 	@#not all $(INSTALL) have a -d flag, have to do it explicitly
-	@echo installing $(INSTSCOREFLAGS) $(SCORE)
+	@echo installing $(INSTSCOREFLAGS) $(DESTDIR)$(SCORE)
 	@set -- $(INSTSCOREFLAGS) ; \
 	while [ $$# -ne 0 ] ; \
 	do \
 	case "$$1" in \
-	"-o") shift ; chown $$1 $(SCORE) ; echo owner is $$1 ;; \
-	"-m") shift ; chmod $$1 $(SCORE) ;; \
-	"-g") shift ; chgrp $$1 $(SCORE) ; echo group is $$1 ;; \
+	"-o") shift ; chown $$1 $(DESTDIR)$(SCORE) ; echo owner is $$1 ;; \
+	"-m") shift ; chmod $$1 $(DESTDIR)$(SCORE) ;; \
+	"-g") shift ; chgrp $$1 $(DESTDIR)$(SCORE) ; echo group is $$1 ;; \
 	*) echo unknown option '$$1' ;; \
 	esac ; \
 	shift ; \