$NetBSD: patch-aa,v 1.4 2003/03/07 11:40:58 wiz Exp $ --- Makefile.orig Wed Feb 19 08:27:22 2003 +++ Makefile @@ -11,7 +11,7 @@ # Where to install things: -PREFIX=/usr/local +#PREFIX=/usr/local # Program: @@ -27,16 +27,9 @@ DATA_PREFIX=$(PREFIX)/share/tuxpaint/ # Docs and man page: DOC_PREFIX=$(PREFIX)/share/doc/tuxpaint/ -MAN_PREFIX=$(PREFIX)/share/man/ +MAN_PREFIX=$(PREFIX)/man/ -# 'System-wide' Config file: - -ifeq ($(PREFIX),/usr) - CONFDIR=/etc/tuxpaint -else - CONFDIR=$(PREFIX)/etc/tuxpaint -endif # Commands useful to other arch's (e.g., BeOS) @@ -74,7 +67,7 @@ SDL_CFLAGS=$(shell sdl-config --cflags) # The entire set of CFLAGS: -CFLAGS=-O2 -Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \ +CFLAGS+=-Wall $(SDL_CFLAGS) -DDATA_PREFIX=\"$(DATA_PREFIX)\" \ -D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \ -DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\" @@ -132,8 +125,7 @@ beos: # to do this as superuser ("root")) install: install-bin install-data install-man install-doc \ - install-gnome install-kde install-kde-icons \ - install-icon install-gettext install-importscript \ + install-gettext install-importscript \ install-default-config @echo @echo "--------------------------------------------------------------" @@ -244,9 +236,9 @@ uninstall: install-default-config: @echo @echo "...Installing default config file..." - @install -d $(CONFDIR) - @cp src/tuxpaint.conf $(CONFDIR) - @chmod 644 $(CONFDIR)/tuxpaint.conf + @install -d $(PREFIX)/share/examples/tuxpaint + @cp src/tuxpaint.conf $(PREFIX)/share/examples/tuxpaint + @chmod 644 $(PREFIX)/share/examples/tuxpaint/tuxpaint.conf # Install a launcher icon in the Gnome menu, under "Graphics"