diff options
| author | Pale Moon <git-repo@palemoon.org> | 2015-06-23 10:56:37 +0200 |
|---|---|---|
| committer | Pale Moon <git-repo@palemoon.org> | 2015-06-23 10:56:37 +0200 |
| commit | b4b295d3ace34d4dd983a0e07c61cdad2075f883 (patch) | |
| tree | 6f8c5c127468dde58216053ac3707d59c7ecc567 /config | |
| parent | 19cd1449867e6d0b4b625327213b68d2e0cd84d5 (diff) | |
| parent | ad14fac50025458839adc27e7778be8c8c13fd5a (diff) | |
| download | palemoon-gre-b4b295d3ace34d4dd983a0e07c61cdad2075f883.tar.gz | |
Merge branch 'master' into Goanna
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.mk b/config/config.mk index 760d4b835..3f6006a6f 100644 --- a/config/config.mk +++ b/config/config.mk @@ -381,7 +381,7 @@ JAVA_IFACES_PKG_NAME = org/mozilla/interfaces OS_INCLUDES += $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS) $(MOZ_WEBP_CFLAGS) ifndef MOZ_TREE_PIXMAN -OS_INCLUDES += $(pkg-config --cflags pixman-1) +OS_INCLUDES += $(shell pkg-config --cflags pixman-1 || true) endif # NSPR_CFLAGS and NSS_CFLAGS must appear ahead of OS_INCLUDES to avoid Linux |