diff options
author | Michael Drake <tlsa@netsurf-browser.org> | 2012-07-21 11:49:19 +0100 |
---|---|---|
committer | Michael Drake <tlsa@netsurf-browser.org> | 2012-07-21 11:49:19 +0100 |
commit | 60db24cf8755fb8df3003c4f25c15efd142e4af3 (patch) | |
tree | 0337be8a047e3d8475f9e2f048f42f6764230367 | |
parent | 717dfae6f80beeaa8937510fb2f6e8113c2b3426 (diff) | |
parent | ae7d1141012c438c1ec101747038f83c9db33d7a (diff) | |
download | netsurf-60db24cf8755fb8df3003c4f25c15efd142e4af3.tar.gz netsurf-60db24cf8755fb8df3003c4f25c15efd142e4af3.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
-rw-r--r-- | Makefile | 21 |
1 files changed, 19 insertions, 2 deletions
@@ -241,8 +241,25 @@ else ifeq ($(TARGET),cocoa) PKG_CONFIG := PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):/usr/local/lib/pkgconfig" pkg-config else - # Building for GTK, Framebuffer, Atari - PKG_CONFIG := pkg-config + ifeq ($(TARGET),atari) + ifeq ($(HOST),atari) + PKG_CONFIG := pkg-config + else + ifeq ($(HOST),mint) + PKG_CONFIG := pkg-config + else + GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-atari-mint/env + GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/m68k-atari-mint/cross/bin + + CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) + + PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config + endif + endif + else + # Building for GTK, Framebuffer + PKG_CONFIG := pkg-config + endif endif endif endif |