--- Makefile.macros-original	Fri Jan  4 04:02:01 2002
+++ Makefile.macros	Wed Jul 31 15:36:19 2002
@@ -40,7 +40,10 @@
 SIM_LIB_NAME	= sim
 THREAD_NAME	= Posix
 #THREAD_NAME	= Win32
-THREAD_BASE	= pthread
+THREAD_BASE	= pthread -L/usr/pkg/lib -Rl,rpath /usr/pkg/lib
+THREAD_BASE	= pthread -L/usr/pkg/lib -Xlinker rpath -Xlinker /usr/pkg/lib 
+THREAD_BASE	= pthread -L/usr/pkg/lib 
+THREAD_BASE	= pthread 
 #THREAD_BASE	= kernel32
 
 # --- bitvector library name
@@ -51,6 +54,7 @@
 
 # --- paths
 SPECC		= /home/specc/scrc/release-1.2
+SPECC		= /export/local-src/scrc-1.2
 SPECC_HOME	= $(SPECC)
 SPECC_BIN	= $(SPECC)/bin
 SPECC_SRC	= $(SPECC)/src
@@ -62,6 +66,7 @@
 #SPECC_INSTALL	= $(SPECC)/install
 #SPECC_INSTALL	= /usr/local/$(PROJECT)
 SPECC_INSTALL	= /home/specc/scrc/public
+SPECC_INSTALL	= /export/specc/scrc/public
 
 #SPECC_SLIB	= $(SPECC_LIB)
 SPECC_SLIB	= $(SPECC_INSTALL)/lib
@@ -77,16 +82,17 @@
 INSTALL_PERM	= u+rwX,g-sw+rX,o-w+rX
 
 # --- target platform
-TARGET		= SOLARIS
+#TARGET		= SOLARIS
 #TARGET		= SUNOS4
-#TARGET		= NETBSD
+TARGET		= NETBSD
 #TARGET		= LINUX
 #TARGET		= GNUWIN32
 
 # --- target system, operating system, target cpu
-SYSTEM		= -DSPARC -DSOLARIS -mv8 -mfpu
+#SYSTEM		= -DSPARC -DSOLARIS -mv8 -mfpu
 #SYSTEM		= -DSPARC -DSUNOS4 -mv8 -mfpu
 #SYSTEM		= -DAMIGA -DNETBSD -m68030 -m68881
+SYSTEM		= -DNETBSD
 #SYSTEM		= -DX86 -DLINUX
 #SYSTEM		= -DX86 -DGNUWIN32
 #SYSTEM		= -DX86 -DGNUWIN32 -DWIN_NT
@@ -119,9 +125,9 @@
 #		-D__extension__= $(GCC296)			# GNUWIN32
 
 # --- shared library flags
-SHARED	= -shared -nodefaultlibs			# SOLARIS
+#SHARED	= -shared -nodefaultlibs			# SOLARIS
 #SHARED	= -shared -nodefaultlibs			# SUNOS4
-#SHARED	= -shared -nodefaultlibs -Xlinker -shared	# NETBSD
+SHARED	= -shared -nodefaultlibs -Xlinker -shared	# NETBSD
 #SHARED	= -shared					# LINUX
 #SHARED	= -shared					# GNUWIN32
 
@@ -169,7 +175,7 @@
 
 # --- compiler options
 CCOPT	= $(OPTIM) $(CCSPCL) $(DYNLIB) $(KANJI) $(LLONG) $(ARYASN) \
-		-fno-implicit-templates
+		-fno-implicit-templates -I/usr/pkg/include
 
 # --- compilation flag for debug executables (testing)
 DEBUG	= -DDEBUG
@@ -195,11 +201,13 @@
 LNPURE	= $(PURIFY) $(LN)
 
 # --- system libraries for the linker
-STDLIB	= 			# SOLARIS
+# STDLIB	= 			# SOLARIS
 #STDLIB	= -ll			# SUNOS4
-#STDLIB	= -ll			# NETBSD
+# STDLIB	= -ll			# NETBSD
 #STDLIB	=  			# LINUX
 #STDLIB	= 			# GNUWIN32
+STDLIB = -Rl,rpath=/usr/pkg/lib -L/usr/pkg/lib -lstdc++ 
+STDLIB = -L/usr/pkg/lib -lstdc++ 
 
 # --- lex call to generate scanners
 LEX	= flex