From 42a93d359f28adb36d0aa7a2d6f71109f5435b34 Mon Sep 17 00:00:00 2001
From: Kurt Zenker <kz@openoffice.org>
Date: Tue, 20 May 2008 13:09:23 +0000
Subject: INTEGRATION: CWS obo27 (1.3.4); FILE MERGED 2008/05/02 07:47:36 obo
 1.3.4.3: #i88875# Build problems for unxmacxi in SO environment 2008/04/30
 08:30:06 obo 1.3.4.2: new try 2008/04/24 09:13:28 obo 1.3.4.1: #i10000# build
 problem for SO environment

---
 xpdf/makefile.mk | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'xpdf')

diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 8d244318766e..fc808ff62d5f 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.3 $
+# $Revision: 1.4 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -50,6 +50,14 @@ PATCH_FILE_NAME=$(TARFILE_NAME).patch
 CONFIGURE_DIR=
 BUILD_DIR=$(CONFIGURE_DIR)
 
+.IF "$(SYSBASE)"!=""
+.IF "$(EXTRA_CFLAGS)"!=""
+CFLAGS:=$(EXTRA_CFLAGS)
+CXXFLAGS:=$(EXTRA_CFLAGS)
+.EXPORT : CFLAGS CXXFLAGS
+.ENDIF # "$(EXTRA_CFLAGS)"!=""
+.ENDIF # "$(SYSBASE)"!=""
+
 .IF "$(GUI)"=="UNX"
 #CONFIGURE_ACTION=./configure
 #CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-exceptions CFLAGS="-g -O0" CXXFLAGS="-g -O0"
-- 
cgit