61 lines
1.9 KiB
Text
61 lines
1.9 KiB
Text
$NetBSD: patch-ag,v 1.4 2006/10/09 20:04:38 mlelstv Exp $
|
|
|
|
--- conf/defaults.orig Thu Jul 29 17:33:56 1993
|
|
+++ conf/defaults
|
|
@@ -65,7 +65,7 @@
|
|
# the following definition:
|
|
# SYS_DIR = $(DIST_DIR)
|
|
|
|
-SYS_DIR = $(TOP1)/$(SYSTEM)
|
|
+SYS_DIR = $(TOP0)/$(SYSTEM)
|
|
|
|
# OBJ_TOP is the directory in which intermidiate files reside
|
|
# These are ".o" files, synthesized ".c" files, ".a" files,
|
|
@@ -105,12 +105,12 @@
|
|
# identified as and SYSTEM is the name of the per-system definitions
|
|
# file listed on the "build" command line.
|
|
|
|
-SPICE_DIR = $(TOP1)/$(SYSTEM)
|
|
-SPICE_LIB_DIR = $(SPICE_DIR)/lib
|
|
+SPICE_DIR = @PREFIX@
|
|
+SPICE_LIB_DIR = $(SPICE_DIR)/share/spice3
|
|
SPICE_EXEC_DIR = $(SPICE_DIR)/bin
|
|
|
|
S_SPICE_DIR = $(SPICE_DIR)
|
|
-S_SPICE_LIB_DIR = $(S_SPICE_DIR)/lib
|
|
+S_SPICE_LIB_DIR = $(S_SPICE_DIR)/share/spice3
|
|
S_SPICE_EXEC_DIR= $(S_SPICE_DIR)/bin
|
|
|
|
# INSTALL_DIRS lists the directories that need to be created before
|
|
@@ -129,11 +129,11 @@
|
|
# an extra definition to work around the same strange bug. See either
|
|
# file "conf/vax" or "conf/gcc".
|
|
|
|
-CC = cc
|
|
+CC = gcc
|
|
|
|
# CC_OPT: Default compile options (optimization/debug level, other)
|
|
|
|
-CC_OPT = -O
|
|
+CC_OPT = -O2 -pipe
|
|
|
|
# CC_OPT_SAFE: Special compile options to override CC_OPT for code
|
|
# which typically causes problems for most compilers (bsim1 and bsim2).
|
|
@@ -203,7 +203,7 @@
|
|
# X_DIR indicates the top of the X11 lib/include hierarchy; it is only
|
|
# a convenience that is used in the following definitions.
|
|
|
|
-X_DIR = /usr
|
|
+X_DIR = @X11BASE@
|
|
|
|
# INCX lists the X include directories. This may be different between
|
|
# MIT X11r5, X11r4, and your vendor's version of X11, though listing
|
|
@@ -218,7 +218,7 @@
|
|
# which is not available with all versions of X11. If you do not have
|
|
# it, then you do not need it (delete the following reference to it).
|
|
|
|
-LIBX = -L$(X_DIR)/lib -lXaw -lXt -lXext -lXmu -lX11
|
|
+LIBX = -L$(X_DIR)/lib -Wl,-R@X11BASE@/lib -lXaw -lXt -lXext -lXmu -lSM -lICE -lX11
|
|
|
|
|
|
|