--- Makefile.orig Fri Dec 8 08:00:44 2000
+++ Makefile Tue Dec 26 22:01:42 2000
@@ -21,7 +21,7 @@
##
#CC = gcc
-CC = cc
+CC ?= cc
#CC = CC
##
@@ -49,7 +49,7 @@
# SGI Mipspro
#prereleaseflags = -g -n32 -Xcpluscomm -woff 1009,1014,1048,1110,1116,1185,1188,1204,1230,1233
# Sun Workshop C Compiler
-prereleaseflags = -v -g -xstrconst
+#prereleaseflags = -v -g -xstrconst
# Sun Workshop C++ Compiler
#prereleaseflags = +w -g
@@ -61,9 +61,9 @@
##
# Linux, NetBSD, FreeBSD, BSDI, OSF1, SunOS4this
-#RANLIB = ranlib
+RANLIB = ranlib
# SVR4, Irix, AIX, Qnx, Solaris 2.x
-RANLIB = /bin/true
+#RANLIB = /bin/true
##
## System configuration flags
@@ -84,13 +84,13 @@
# Qnx
#sysconfigflags = -DQNX
# FreeBSD
-#sysconfigflags = -DFreeBSD
+sysconfigflags = -DFreeBSD
# NetBSD
#sysconfigflags = -DNETBSD
# Irix
#sysconfigflags = -DSVR4 -DIRIX
# Solaris2.5 & 2.5.1
-sysconfigflags = -DSOLARIS -DSVR4
+#sysconfigflags = -DSOLARIS -DSVR4
# Use Motif 1.2.x
sysconfigflags += -DMOTIF1_2
@@ -122,7 +122,7 @@
# Irix
#syslibs = -lPW
# Solaris 2.x, Motorola SVR4
-syslibs = -lsocket -lnsl -ldl
+#syslibs = -lsocket -lnsl -ldl
##
## X11 includes
@@ -133,13 +133,13 @@
#xinc = -I/usr/include/X11
#xinc = -I/usr/X11/include
# Linux, FreeBSD
-#xinc = -I/usr/X11R6/include
+xinc = -I/X11BASE/include
# Irix
#xinc = -I/usr/include
# Solaris 2.x
#xinc = -I/usr/openwin/include -I/usr/dt/include
#solaris8
-xinc = -I/usr/openwin/include -I/usr/dt/include -DMOTIF12_HEADERS
+#xinc = -I/usr/openwin/include -I/usr/dt/include -DMOTIF12_HEADERS
##
@@ -159,16 +159,16 @@
# QNX
#xlibs = -L/usr/X11/lib -lXm_s -lXt_s -lX11_s -lXqnx_s -lXt -lXmu -lXext
# Linux, FreeBSD, NetBSD with Lesstif
-#xlibs = -L/usr/X11R6/lib -lXm -lXmu -lXt -lXext -lX11 -lm
+xlibs = -L/X11BASE/lib -lXm -lXmu -lXt -lXext -lX11 -lm
# some distrib. of Linux require -lSM -lICE
# Linux Red Hat 6.1 lesstif-0.88.1-3 kernel 2.2.12-20
#xlibs = -L/usr/X11R6/lib -lXm -lXmu -lXt -lXext -lX11 -lm -lSM -lICE
# Irix
#xlibs = -L/usr/lib32 -lXm -lXmu -lXt -lXext -lX11 -lm
# Solaris 2.x
-xlibs = -L/usr/openwin/lib -R/usr/openwin/lib -L/usr/dt/lib -R/usr/dt/lib
+#xlibs = -L/usr/openwin/lib -R/usr/openwin/lib -L/usr/dt/lib -R/usr/dt/lib
#xlibs += -lXm -lXmu -lXt -lXext -lX11 -lm
-xlibs += -lXm12 -lXmu -lXt -lXext -lX11 -lm
+#xlibs += -lXm12 -lXmu -lXt -lXext -lX11 -lm
#
# private
@@ -185,11 +185,11 @@
#pnginc = /usr/local/include
#pnglibs = /usr/local/lib/libpng.a /usr/lib32/libz.a
# FreeBSD
-#pnginc = /usr/local/include
-#pnglibs = /usr/local/lib/libpng.a /usr/lib/libz.a
-# Solaris
-pnginc = /usr/local/include
-pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a
+pnginc = LOCALBASE/include
+pnglibs = LOCALBASE/lib/libpng.a /usr/lib/libz.a
+# Solaris
+#pnginc = /usr/local/include
+#pnglibs = /usr/local/lib/libpng.a /usr/local/lib/libz.a
# To disable PNG support comment this.
@@ -249,20 +249,20 @@
## OBJECT dynamique plugin support (new and experimental)
##
-plugflags = -DOBJECT
+#plugflags = -DOBJECT
# to compile plugins given as examples
-PLUGINCDIR = $(PWD)/libhtmlw
-PLUGINC = -I$(PLUGINCDIR)
-INSTALL_PLUG_DIR = /usr/local/mMosaic/plugins
-explugdir = $(PWD)/plugins/examples
+#PLUGINCDIR = $(PWD)/libhtmlw
+#PLUGINC = -I$(PLUGINCDIR)
+#INSTALL_PLUG_DIR = /usr/local/mMosaic/plugins
+#explugdir = $(PWD)/plugins/examples
# for gcc
#explugccflag = -fpic
#explugldflag = -shared
#
# for Solaris cc workshop
-explugccflag = -I$(plugdir) -KPIC
-explugldflag = -G
+#explugccflag = -I$(plugdir) -KPIC
+#explugldflag = -G
##
## Customization flags
@@ -295,7 +295,7 @@
##
ARCHIVEDIR = /enst/ftp/pub/mbone/mMosaic
-CFLAGS = $(sysconfigflags) $(prereleaseflags) $(mcflag) $(plugflags) $(customflags)
+CFLAGS += $(sysconfigflags) $(prereleaseflags) $(mcflag) $(plugflags) $(customflags)
all: libhtmlw libnut $(mclib) $(explugdir) src
@echo \*\*\* Welcome to mMosaic.
