diff options
| author | François Revel <mmu_man@netsurf-browser.org> | 2011-01-23 20:31:36 +0000 |
|---|---|---|
| committer | François Revel <mmu_man@netsurf-browser.org> | 2011-01-23 20:31:36 +0000 |
| commit | 4dda0f02044a189fa8eac3900d96260c5851271f (patch) | |
| tree | 1fa0e8cf190aeca4fb4f96f6631f9ea72282497c /cocoa/Makefile.target | |
| parent | d4881ab935688da2131a965180c99b01a92bae40 (diff) | |
| download | netsurf-4dda0f02044a189fa8eac3900d96260c5851271f.tar.gz netsurf-4dda0f02044a189fa8eac3900d96260c5851271f.tar.bz2 | |
- whitespace cleanup.
- check if /opt/local exists and add it to search paths, so libjpeg installed by MacPort can be found, as it doesn't seem to have a pkg-config descriptor.
svn path=/trunk/netsurf/; revision=11471
Diffstat (limited to 'cocoa/Makefile.target')
| -rw-r--r-- | cocoa/Makefile.target | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target index 584fa7e04..fdb063460 100644 --- a/cocoa/Makefile.target +++ b/cocoa/Makefile.target @@ -29,8 +29,14 @@ CFLAGS += -I/usr/X11/include CFLAGS += -I/usr/include/libxml2 - CFLAGS += -Icocoa/PSMTabBarControl - CFLAGS += -include cocoa/Prefix.pch + CFLAGS += -Icocoa/PSMTabBarControl + CFLAGS += -include cocoa/Prefix.pch + +ifneq ($(wildcard /opt/local*),) + # libjpeg is there when installed from MacPort. + LDFLAGS += -L/opt/local/lib + CFLAGS += -I/opt/local/include +endif VERSION_FULL := $(shell sed -n '/"/{s/.*"\(.*\)".*/\1/;p;}' desktop/version.c) VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c) @@ -163,4 +169,4 @@ NetSurf.app/Contents/Info.plist: cocoa/res/NetSurf-Info.plist cocoa/Makefile.tar -e 's/$${MACOSX_DEPLOYMENT_TARGET}/$(MACOSX_VERSION)/' \ -e 's/$${NETSURF_VERSION}/$(VERSION_FULL)/' \ -e 's/$${NETSURF_SHORT_VERSION}/$(VERSION_MAJ).$(VERSION_MIN)/' \ - < cocoa/res/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist
\ No newline at end of file + < cocoa/res/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist |