From: anonymous Date: Wed, 13 Dec 2006 14:53:51 +0000 (+0000) Subject: Include any existing LDFLAGS environment when linking so that a MacOS X Universal... X-Git-Tag: v_3_0_7~456 X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=419bc1ce80a39145feb85f4beb5ed7e5b05a4a1c Include any existing LDFLAGS environment when linking so that a MacOS X Universal Binary can be created. --- diff --git a/GNUmakefile.in b/GNUmakefile.in index 7e498dfb..638f947a 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.150 2006/10/25 11:55:45 fabiankeil Exp $ +# $Id: GNUmakefile.in,v 1.151 2006/11/30 01:08:55 hal9 Exp $ # # Written by and Copyright (C) 2001 - 2004 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -246,7 +246,7 @@ OTHER_CFLAGS = CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ @STATIC_PCRE_ONLY@ -Ipcre -LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) +LDFLAGS = @LDFLAGS@ $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) ############################################################################# @@ -1355,6 +1355,9 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.151 2006/11/30 01:08:55 hal9 +# Fix problem with variable declarations in the Slackware section. Thanks to higuita. +# # Revision 1.150 2006/10/25 11:55:45 fabiankeil # Fix sed regexes for rewriting "confdir ." and "logdir .". # Thanks to Darel Henman for reporting this.