mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-11-24 07:19:37 +03:00
- 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
This commit is contained in:
parent
d4881ab935
commit
4dda0f0204
@ -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
|
||||
< cocoa/res/NetSurf-Info.plist > NetSurf.app/Contents/Info.plist
|
||||
|
Loading…
Reference in New Issue
Block a user