From 991d379eb79c300b75b6ff6a17b74e9710b247d0 Mon Sep 17 00:00:00 2001 From: simon Date: Thu, 17 Dec 2009 17:55:42 +0000 Subject: [PATCH] Patch from Frode Austvik to permit passing CFLAGS in to the Unix makefile. git-svn-id: svn://svn.tartarus.org/sgt/puzzles@8782 cda61777-01e9-0310-a592-d414129be87e --- mkfiles.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mkfiles.pl b/mkfiles.pl index 01f60e1..796547a 100755 --- a/mkfiles.pl +++ b/mkfiles.pl @@ -1100,7 +1100,7 @@ if (defined $makefiles{'gtk'}) { "\n". "# You can define this path to point at your tools if you need to\n". "# TOOLPATH = /opt/gcc/bin\n". - "CC = \$(TOOLPATH)cc\n". + "CC := \$(TOOLPATH)\$(CC)\n". "# You can manually set this to `gtk-config' or `pkg-config gtk+-1.2'\n". "# (depending on what works on your system) if you want to enforce\n". "# building with GTK 1.2, or you can set it to `pkg-config gtk+-2.0'\n". @@ -1108,9 +1108,9 @@ if (defined $makefiles{'gtk'}) { "# to 1.2 if it isn't found.\n". "GTK_CONFIG = sh -c 'pkg-config gtk+-2.0 \$\$0 2>/dev/null || gtk-config \$\$0'\n". "\n". - &splitline("CFLAGS = -O2 -Wall -Werror -ansi -pedantic -g " . + &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " . (join " ", map {"-I$dirpfx$_"} @srcdirs) . - " `\$(GTK_CONFIG) --cflags`")."\n". + " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n". "XLDFLAGS = `\$(GTK_CONFIG) --libs`\n". "ULDFLAGS =#\n". "INSTALL=install\n", -- 2.11.0