--- ./DEMOS/Makefile	Sun Feb 15 21:47:55 1998
+++ ../xforms/./DEMOS/Makefile	Thu Jun 21 14:07:15 2001
@@ -3,9 +3,9 @@
 # Flags that might be overriden by top makefile
 #
 
-CC=cc
-CCFLAG=-O
-LDFLAG=-O -s 
+# CC=cc
+# CCFLAG=-O
+# LDFLAG=-O -s 
 SYSLIB=-lX11 -lm
 
 SHELL=/bin/sh
@@ -16,10 +16,10 @@
 # Flags the compiler will see
 #
 
-CFLAGS=$(CCFLAG) -I../FORMS $(XINCLUDE) -Ifd
-LDFLAGS = $(LDFLAG) 
+# CFLAGS=$(CCFLAG) -I../FORMS -Ifd
+# LDFLAGS = $(LDFLAG) 
 LIBS=-L../FORMS -lforms $(SYSLIB)
-GLLIBS=-L../FORMS -lforms -lGL -lXext $(SYSLIB)
+# GLLIBS=-L../FORMS -lforms -lGL -lXext $(SYSLIB)
 
 
 #
@@ -26,7 +26,7 @@
 DEMOSO= freedraw.o demo.o colsel.o borderwidth.o xyplotover.o\
 	pushme.o yesno.o pushbutton.o buttonall.o demo05.o \
 	demo06.o touchbutton.o \
-        colsel1.o ldial.o fdial.o\
+	colsel1.o ldial.o fdial.o\
 	fbrowse1.o flclock.o menu.o free1.o \
 	goodies.o boxtype.o sldinactive.o sld_radio.o \
 	positioner.o positionerXOR.o arrowbutton.o sldsize.o sliderall.o symbols.o \
@@ -70,22 +70,21 @@
 nnn: nnn.o crossbut.o crossbut.h
 	-$(CC) $(LDFLAGS) -o $@ nnn.o crossbut.o $(LIBS)
 
-clean:
-	-rm -f  *.o core a.out *~
-
-empty: clean
+clean: cleansrc
 	-rm -f $(DEMOS) newbutton nnn elog mlog gl glwin demotest \
-          folder menubar demotest1 demotest2
+		folder menubar demotest1 demotest2
 	-rm -f old*
 	-rm -f *ps
 	-rm -f fd/*bak
 
+cleansrc:
+	-rm -f  *.o core a.out *~
 
 demoprep:
 	-@if [ "$(SHARED_NAME)" != "" ]; then\
-           cd ../FORMS;       \
-           if [ -f $(SHARED_LIB) ]; then \
-                $(LN) $(SHARED_LIB) $(SHARED_NAME);\
-           fi;\
-        fi
+		cd ../FORMS;       \
+		if [ -f $(SHARED_LIB) ]; then \
+			$(LN) $(SHARED_LIB) $(SHARED_NAME);\
+		fi;\
+	fi
 
--- ./Makefile	Sat Feb 28 19:40:34 1998
+++ ../xforms/./Makefile	Thu Jun 21 15:17:03 2001
@@ -21,29 +21,38 @@
 include mkconfig.h
 ##### don't change anything after this line ####
 
+all: FORMS/$(SHARED_LIB) demo
+
+FORMS/$(SHARED_LIB):
+	(cd FORMS; $(MKSHLIB))
+	if [ -f FORMS/$(SHARED_LIB) -a ! -f FORMS/$(SHARED_NAME) ]; then \
+		(cd FORMS; ln -s $(SHARED_LIB) $(SHARED_NAME));\
+	fi
+
 demo: 
-	@(cd DEMOS; make) 
+	(cd DEMOS; $(MAKE) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS) -I../FORMS -Ifd" LDFLAGS="$(LDFLAGS)" \
+		RANLIB=':' INSTALL="$(INSTALL)")
 
 install:
-	cp FORMS/$(FORMLIB) $(LIB_DIR);chmod $(LIBMODE) $(LIB_DIR)/$(FORMLIB)
-	cp DESIGN/fdesign $(BIN_DIR); chmod $(BINMODE) $(BIN_DIR)/fdesign
-	cp fd2ps/fd2ps $(BIN_DIR); chmod $(BINMODE) $(BIN_DIR)/fd2ps
+	(cd FORMS && $(INSTALL) -m $(HEADERMODE) $(FORMHEADER) $(HEADER_DIR))
+	(cd FORMS && $(INSTALL) -m $(LIBMODE) $(FORMLIB) $(LIB_DIR))
 	-@if [ "$(SHARED_LIB)" != "" ]; then\
-           cp FORMS/$(SHARED_LIB) $(LIB_DIR); \
-           chmod $(LIBMODE) $(LIB_DIR)/$(SHARED_LIB);\
-           if [ "$(SHARED_NAME)" != "" ]; then\
-              $(LN) $(LIB_DIR)/$(SHARED_LIB) $(LIB_DIR)/$(SHARED_NAME);\
-           fi \
-        fi
-	cp FORMS/$(FORMHEADER) $(HEADER_DIR);\
-           chmod $(HEADERMODE) $(HEADER_DIR)/$(FORMHEADER)
-	cp FORMS/xforms.5 $(MAN5_DIR);  chmod $(MANMODE) $(MAN5_DIR)/xforms.5
-	cp DESIGN/fdesign.1 $(MAN1_DIR); chmod $(MANMODE) $(MAN1_DIR)/fdesign.1
-	cp fd2ps/fd2ps.1 $(MAN1_DIR); chmod $(MANMODE) $(MAN1_DIR)/fd2ps.1
-	@if [ ! -f $(MAN5_DIR)/forms.5 ]; then\
-          ln -s $(MAN5_DIR)/xforms.5 $(MAN5_DIR)/forms.5;\
-        fi
+		(cd FORMS && $(INSTALL) -m $(LIBMODE) $(SHARED_LIB) $(LIB_DIR));\
+		if [ "$(SHARED_NAME)" != "" ]; then\
+			(cd FORMS && $(INSTALL) -m $(LIBMODE) $(SHARED_NAME) $(LIB_DIR));\
+		fi \
+	fi
+	(cd FORMS && $(INSTALL) -m $(MANMODE) xforms.5 $(MAN5_DIR))
+	# (cd FORMS && $(INSTALL) -t $(MAN5_DIR)/xforms.5 $(MAN5_DIR)/forms.5)
+	(cd DESIGN && $(INSTALL) -m $(BINMODE) fdesign $(BIN_DIR))
+	(cd DESIGN && $(INSTALL) -m $(BINMODE) fd2ps $(BIN_DIR))
+	(cd DESIGN && $(INSTALL) -m $(MANMODE) fdesign.1 $(MAN1_DIR))
+	(cd DESIGN && $(INSTALL) -m $(MANMODE) fd2ps.1 $(MAN1_DIR))
+	(cd DEMOS && /bin/ls -1 | egrep -v -e "(^01.*)|(*Make)|(^.*\.[coh])" | xargs -i $(INSTALL) -m $(BINMODE) {} $(DEMOLIB))
+	
 clean:
-	(cd  DEMOS; make $@)
-empty:
-	(cd  DEMOS; make $@)
+	(cd  DEMOS; $(MAKE) $@)
+	rm -f FORMS/$(SHARED_NAME)
+	rm -f FORMS/$(SHARED_LIB)
+	rm -f FORMS/so_locations
+
--- ./mkconfig.h	Sat Feb 28 19:40:32 1998
+++ ../xforms/./mkconfig.h	Mon Jun 18 10:43:45 2001
@@ -3,28 +3,30 @@
 # library should be installed in /usr/lib32
 #  
 #
-CC=cc
-CCFLAG=-O -mips3 -n32
-LDFLAG=-O -mips3 -n32 -s
-AR=ar rs
-RANLIB=touch
-XINCLUDE=
-SYSLIB=-lX11 -lm
+# CC=cc
+# CCFLAG=-O -mips3 -n32
+# LDFLAG=-O -mips3 -n32 -s
+# AR=ar rs
+# RANLIB=touch
+# XINCLUDE=
+# SYSLIB=-lX11 -lm
 
 # where the library should be installed
 
-LIB_DIR=/usr/lib32
+LIB_DIR=/usr/freeware/lib32
 LIBMODE=644
 
-HEADER_DIR=/usr/include
+HEADER_DIR=/usr/freeware/include
 HEADERMODE=644
 
-BIN_DIR=/usr/local/bin
+BIN_DIR=/usr/freeware/bin
 BINMODE=711
 
-MAN5_DIR=/usr/man/man5
-MAN1_DIR=/usr/man/man1
-DOC_DIR=/usr/local/lib
+DEMOLIB=/usr/freeware/lib/xforms
+
+MAN5_DIR=/usr/freeware/man/man5
+MAN1_DIR=/usr/freeware/man/man1
+DOC_DIR=/usr/freeware/lib
 MANMODE=644
 
 # name and header of the library
@@ -34,10 +36,10 @@
 SHARED_NAME=libforms.so
 SHARED_LIB=libforms.so.0.88
 # make shared lib: $(MKSHLIB) 
-MKSHLIB=ld -n32 -mips3 -shared -no_unresolved -rdata_shared\
-      -set_version sgi0.88 -o $(SHARED_LIB) -all libforms.a\
-      ../xpm-3.4g/lib/libXpm.a\
+MKSHLIB=$(LD) $(LDFLAGS) -no_unresolved -rdata_shared\
+      -shared -rpath /usr/freeware/lib32\
+      -set_version sgi0.88 -o $(SHARED_LIB) -all ./libforms.a\
       -delay_load -lGL\
-      -lX11 -lm -lc
+      -lX11 -lm -lc -lXpm
 
 LN=ln -fs