From dc16cca7ce3d6c29b343090b8b5214d22c479c54 Mon Sep 17 00:00:00 2001
From: Ivo Hinkelmann <ihi@openoffice.org>
Date: Wed, 23 Sep 2009 11:33:25 +0000
Subject: #i10000# #i105297#  use common configure action

---
 xpdf/makefile.mk | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'xpdf')

diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index ec1c6ed7b9be..337c0a28c162 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -80,16 +80,13 @@ LDFLAGS:=$(ARCH_FLAGS)
 .EXPORT : CFLAGS CXXFLAGS LDFLAGS
 .ENDIF
 
-.IF "$(OS)"=="MACOSX"
 CONFIGURE_ACTION=configure
 CONFIGURE_FLAGS+=--without-x --without-libpaper-library --without-t1-library --enable-multithreaded --enable-exceptions
-.IF "$(CPU)"=="P"
+
+.IF "$(OS)$(CPU)"=="MACOSXP"
 CXXFLAGS+=-malign-natural
 .EXPORT: CXXFLAGS
 .ENDIF
-.ELSE
-CONFIGURE_ACTION=./configure --without-libpaper-library --without-t1-library --without-x --enable-multithreaded --enable-exceptions
-.ENDIF
 
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 .ELSE
-- 
cgit