50 lines
1.5 KiB
Plaintext
50 lines
1.5 KiB
Plaintext
$NetBSD: patch-ab,v 1.4 2007/12/01 13:55:12 rillig Exp $
|
|
|
|
--- unix/Makefile.netbsd.orig 2002-01-08 06:18:57.000000000 +1100
|
|
+++ unix/Makefile.netbsd 2003-10-10 13:25:32.000000000 +1000
|
|
@@ -10,26 +10,26 @@
|
|
|
|
# 1) Where to find the Tcl standard library scripts
|
|
# (e.g. init.tcl, ...)
|
|
-TCL_SCRIPT_PATH = /usr/local/lib/tcl8.0
|
|
+TCL_SCRIPT_PATH = ${PREFIX}/lib/tcl8.0
|
|
|
|
# 2) Where to find the Tk standard library scripts
|
|
# (e.g. button.tcl, entry.tcl, ...)
|
|
-TK_SCRIPT_PATH = /usr/local/lib/tk8.0
|
|
+TK_SCRIPT_PATH = ${PREFIX}/lib/tk8.0
|
|
|
|
# 3) Where to find Tcl/Tk header files
|
|
# (e.g. tcl.h, tk.h, ...)
|
|
-TCL_INCL_PATH = -I/usr/local/include
|
|
+TCL_INCL_PATH = -I${PREFIX}/include
|
|
|
|
# 4) Point to specific libtcl.a and libtk.a to use
|
|
-TCL_LIB = /usr/local/lib/libtcl80.a
|
|
-TK_LIB = /usr/local/lib/libtk80.a
|
|
+TCL_LIB = ${PREFIX}/lib/libtcl80.a
|
|
+TK_LIB = ${PREFIX}/lib/libtk80.a
|
|
|
|
|
|
# 5) System specific additional libraries, include paths, etc
|
|
# (Where to find X11 libraries, etc)
|
|
#
|
|
-SYSTEM_INCLUDES = -I/usr/X11R6/include
|
|
-SYSTEM_LDFLAGS = -L/usr/X11R6/lib
|
|
+SYSTEM_INCLUDES = -I${X11BASE}/include
|
|
+SYSTEM_LDFLAGS = -L${X11BASE}/lib -Wl,-R${X11BASE}/lib
|
|
SYSTEM_LIBS =
|
|
|
|
# 6) System specific capabilities
|
|
@@ -62,8 +62,8 @@ SYSTEM_LIBS =
|
|
# (We export these for other Makefiles as needed)
|
|
#
|
|
|
|
-export SYSTEM_HAVES = -DHAVE_GETLOGIN -DHAVE_ASSERT -DHAVE_FLOCK -DHAVE_DIRFD $(DNETSEC)
|
|
+export SYSTEM_HAVES = -DHAVE_GETLOGIN -DHAVE_ASSERT -DHAVE_FLOCK -DHAVE_DIRFD $(DNETSEC) -D__socklen_t_defined=1
|
|
|
|
-export CC = gcc
|
|
+export CC = g++
|
|
|
|
include Makefile.common
|