--- Makefile.orig	2013-03-18 11:17:31.189596000 +0000
+++ Makefile	2010-10-19 01:08:15.000000000 +0900
@@ -143,9 +143,9 @@
 
 # Docs and man page:
 DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint
-DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-dev
-MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
-DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint/dev
+MAN_PREFIX:=$(DESTDIR)$(PREFIX)/man
+DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/man
 
 # BASH tab-completion file:
 COMPLETIONDIR:=$(DESTDIR)/etc/bash_completion.d
@@ -610,8 +607,8 @@
 	@echo
 	@echo "...Installing default config file..."
 	@install -d $(CONFDIR)
-	@cp src/tuxpaint.conf $(CONFDIR)
-	@chmod 644 $(CONFDIR)/tuxpaint.conf
+	@cp src/tuxpaint.conf $(CONFDIR)/tuxpaint.conf.sample
+	@chmod 644 $(CONFDIR)/tuxpaint.conf.sample
 
 # Install BASH completion file:
 .PHONY: install-bash-completion
@@ -1152,10 +1143,10 @@
 	@echo "...Generating 'Magic' tool API configuration script..."
 	@sed -e s/__VERSION__/$(VER_VERSION)/ \
 		-e s/__APIVERSION__/$(MAGIC_API_VERSION)/ \
-		-e s=__INCLUDE__=$(INCLUDE_PREFIX)/tuxpaint= \
-		-e s=__DATAPREFIX__=$(DATA_PREFIX)= \
-		-e s=__PLUGINPREFIX__=$(MAGIC_PREFIX)= \
-		-e s=__PLUGINDOCPREFIX__=$(DOC_PREFIX)/magic-docs= \
+		-e s=__INCLUDE__=$(patsubst $(DESTDIR)%,%,$(INCLUDE_PREFIX))/tuxpaint= \
+		-e s=__DATAPREFIX__=$(patsubst $(DESTDIR)%,%,$(DATA_PREFIX))= \
+		-e s=__PLUGINPREFIX__=$(patsubst $(DESTDIR)%,%,$(MAGIC_PREFIX))= \
+		-e s=__PLUGINDOCPREFIX__=$(patsubst $(DESTDIR)%,%,$(DOC_PREFIX))/magic-docs= \
 		src/tp-magic-config.sh.in \
 		> tp-magic-config
 
@@ -1178,7 +1169,7 @@
 PLUGIN_LIBS:=$($(OS)_PLUGIN_LIBS)
 
 #MAGIC_CFLAGS:=-g3 -O2 -fvisibility=hidden -fno-common -W -Wstrict-prototypes -Wmissing-prototypes -Wall $(MAGIC_SDL_CPPFLAGS) -Isrc/
-MAGIC_CFLAGS:=-g3 -O2 -fno-common -W -Wstrict-prototypes -Wmissing-prototypes -Wall $(MAGIC_SDL_CPPFLAGS) -Isrc/
+MAGIC_CFLAGS:=$(OPTFLAGS) -fno-common -W -Wstrict-prototypes -Wmissing-prototypes -Wall $(MAGIC_SDL_CPPFLAGS) -Isrc/
 SHARED_FLAGS:=-shared -fpic -Wl,--warn-shared-textrel
 
 MAGIC_C:=$(wildcard magic/src/*.c)
