summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2009-09-23 11:33:25 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2009-09-23 11:33:25 +0000
commit8b79b20bb3d991e4559211bd6a0572dbd213043d (patch)
treebc6b4d73e6f0febe3cdb64c7b7818d681de195bf
parent0b81a0ce709a933de3f1f66cddce86a389686eb8 (diff)
#i10000# #i105297# use common configure action
-rw-r--r--xpdf/makefile.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index ec1c6ed..337c0a2 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