Commit 3f4a0762 authored by Bradley Sepos's avatar Bradley Sepos

contrib: Fix fontconfig patch committed as 39f65884.

parent 9ee27720
diff -u Makefile.am.orig Makefile.am diff -u Makefile.am.orig Makefile.am
--- fontconfig-2.12.1/Makefile.am.orig 2016-07-10 22:41:05.000000000 -0400 --- fontconfig-2.12.1/Makefile.am.orig 2016-07-10 22:41:05.000000000 -0400
+++ fontconfig-2.12.1/Makefile.am 2016-12-24 12:16:04.000000000 -0500 +++ fontconfig-2.12.1/Makefile.am 2016-12-24 13:06:05.000000000 -0500
@@ -64,10 +64,12 @@ @@ -65,9 +65,11 @@
xmldir = $(XMLDIR)
xml_DATA = fonts.dtd xml_DATA = fonts.dtd
-if CROSS_COMPILING if CROSS_COMPILING
- RUN_FC_CACHE_TEST=false - RUN_FC_CACHE_TEST=false
-else + RUN_FC_CACHE_TEST=false
else
- RUN_FC_CACHE_TEST=test -z "$(DESTDIR)" - RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
+ifndef RUN_FC_CACHE_TEST + ifndef RUN_FC_CACHE_TEST
+ if CROSS_COMPILING + RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
+ RUN_FC_CACHE_TEST=false + endif
+ else
+ RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
+ endif
endif endif
# Creating ChangeLog from git log: # Creating ChangeLog from git log:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment