From ffa7fede90787a92e035c66ebea5bedd6ad0e86c Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Sun, 22 Jun 2008 17:50:00 +0000 Subject: [PATCH] Made sure Makefile works with NetBSD. --- Makefile | 7 ++++--- docs/CHANGES.txt | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ee13dffbc..7fb37fa28 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ # bill@newbreedsoftware.com # http://www.tuxpaint.org/ -# June 14, 2002 - May 29, 2008 +# June 14, 2002 - June 22, 2008 # The version number, for release: @@ -200,7 +200,7 @@ endif #-ffast-math OPTFLAGS:=-O2 -CFLAGS:=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ +CFLAGS:=$(CPPFLAGS) $(OPTFLAGS) -W -Wall -fno-common -ffloat-store \ $(call comptest,-fvisibility=hidden,) \ -Wcast-align -Wredundant-decls \ -Wbad-function-cast -Wwrite-strings \ @@ -965,12 +965,13 @@ src/tp_magic_api.h: src/tp_magic_api.h.in tp-magic-config: src/tp-magic-config.sh.in Makefile @echo @echo "...Generating 'Magic' tool API configuration script..." - @sed src/tp-magic-config.sh.in -e s/__VERSION__/$(VER_VERSION)/ \ + @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= \ + src/tp-magic-config.sh.in \ > tp-magic-config # Make the "obj" directory to throw the object(s) into: diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 1c63d4ddb..85748d4f5 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -9,7 +9,7 @@ http://www.tuxpaint.org/ $Id$ -2008.June.21 (0.9.20) +2008.June.22 (0.9.20) * New translations: ----------------- * Asturian @@ -89,6 +89,9 @@ $Id$ without sound, etc. Albert Cahalan + * Made sure Makefile works with NetBSD again. + Thomas Klausner + * Makefile edited so that Tux Paint can be installed in the absence of gettext in the system. Arunodai Vudem