$NetBSD: patch-aa,v 1.3 2004/07/23 00:31:23 reed Exp $

--- makefile.in.orig	Wed Sep 11 15:02:00 2002
+++ makefile.in
@@ -3,8 +3,9 @@ CFLAGS	= @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ 
 LDFLAGS	= @LDFLAGS@
 LIBS  = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
 prefix = @prefix@
+datadir = @datadir@
 BINDIR        = $(prefix)/bin
-LIBLOC        = $(prefix)/lib/logo
+LIBLOC        = $(datadir)/ucblogo
 
 # LIBLOC      = `pwd`
 
@@ -18,7 +19,7 @@ SRCS	= coms.c error.c eval.c files.c gra
 
 HDRS	= globals.h logo.h xgraphics.h
 
-all:	logo logolib helpfiles helpfiles/HELPCONTENTS logo-mode
+all:	logo logolib helpfiles helpfiles/HELPCONTENTS
 
 mem.o:	mem.c
 	$(CC) $(CFLAGS) -O0 -c mem.c
@@ -54,12 +55,12 @@ makehelp:	makehelp.c
 
 clean:
 	rm -f *.o libloc.c
-	cd emacs; gmake clean
+	cd emacs; $(MAKE) clean
 
 ship:
 	rm -f config.h config.cache config.log config.status
 	rm -f makefile makehelp logo *.o libloc.c
-	cd emacs; gmake ship
+	cd emacs; $(MAKE) ship
 
 install: all
 	for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
@@ -67,12 +68,12 @@ install: all
 	cp -f logolib/* $(LIBLOC)/logolib/.
 	cp -f helpfiles/* $(LIBLOC)/helpfiles/.
 	cp -f csls/* $(LIBLOC)/csls/.
-	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake install)
-#	prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake install
+#	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
+#	prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install
 
 logo-mode: 
-	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) gmake)
-#	@prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; gmake
+	(cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE))
+#	@prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE)
 
 docs:
-	cd emacs; gmake docs
+	cd emacs; $(MAKE) docs