forked from Lainports/freebsd-ports
3e4ed01146
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav)
21 lines
728 B
Text
21 lines
728 B
Text
$FreeBSD$
|
|
|
|
--- ../../deploy/make/plugin/common/config.gmk.orig Wed Nov 12 16:53:30 2003
|
|
+++ ../../deploy/make/plugin/common/config.gmk Wed Nov 12 16:53:43 2003
|
|
@@ -52,7 +52,6 @@
|
|
|
|
ifeq ($(PLATFORM), bsd)
|
|
PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris
|
|
- LOCALBASE = /usr/X11R6
|
|
OTHER_LDFLAGS = -L$(LOCALBASE)/lib
|
|
ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM)))
|
|
OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib
|
|
@@ -61,7 +60,7 @@
|
|
|
|
# include search paths
|
|
# XXXBSD: these should be defined in other place
|
|
- CPPFLAGS1 += -I$(LOCALBASE)/include -I/usr/local/include
|
|
+ CPPFLAGS1 += -I$(LOCALBASE)/include -I${LOCALBASE}/include
|
|
|
|
ifeq ($(TRUE_PLATFORM), FreeBSD)
|
|
LDFLAGS_COMMON += -pthread
|