summaryrefslogtreecommitdiff
path: root/xpdf
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-04-10 08:09:31 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-04-10 08:09:31 +0000
commit608b65cec70c4bd38da787b14365fbe7caba41e6 (patch)
tree9d66ab78f076a99373faafd7a46dc662bb7e713b /xpdf
parentba62de72233fd9241a583ec8968bb6b646503212 (diff)
#i87925# Applied patch for 'workaround ver. 2.0'.
Diffstat (limited to 'xpdf')
-rw-r--r--xpdf/makefile.mk6
-rw-r--r--xpdf/test/makefile.mk6
2 files changed, 6 insertions, 6 deletions
diff --git a/xpdf/makefile.mk b/xpdf/makefile.mk
index 07c021923423..bd821453ede3 100644
--- a/xpdf/makefile.mk
+++ b/xpdf/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: thb $ $Date: 2007-12-05 14:16:39 $
+# last change: $Author: rt $ $Date: 2008-04-10 09:08:27 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -61,7 +61,7 @@ CONFIGURE_ACTION=./configure --without-x --enable-multithreaded --enable-excepti
BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
.ELSE
CONFIGURE_ACTION=
-BUILD_ACTION=ms_make
+BUILD_ACTION= cmd.exe /c ms_make.bat
.ENDIF
CONVERTFILES=ms_make.bat
diff --git a/xpdf/test/makefile.mk b/xpdf/test/makefile.mk
index 6fcd7b8007df..6107010ce548 100644
--- a/xpdf/test/makefile.mk
+++ b/xpdf/test/makefile.mk
@@ -4,9 +4,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.1 $
+# $Revision: 1.2 $
#
-# last change: $Author: thb $ $Date: 2007-12-05 14:16:42 $
+# last change: $Author: rt $ $Date: 2008-04-10 09:09:31 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@@ -47,7 +47,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : target.mk
-ALLTAR : $(MISC)$/test_0_succeeded $(MISC)$/test_1_succeeded
+#ALLTAR : $(MISC)$/test_0_succeeded $(MISC)$/test_1_succeeded
$(MISC)$/test_0_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_0_out.def text_0_out.def testinput.pdf
$(BIN)$/xpdfimport -f $(MISC)$/binary_0_out testinput.pdf > $(MISC)$/text_0_out