diff -c -r1.1.1.1 -r1.2
*** src/main/Makefile.tmpl	1997/11/15 19:04:47	1.1.1.1
--- src/main/Makefile.tmpl	1998/01/25 11:29:16	1.2
***************
*** 3,9 ****
  # This is combined with the information in the "Configuration" file
  # by the configure script to make the actual Makefile.
  
! CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  LIBS=$(EXTRA_LIBS) $(LIBS1)
  INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES)
  LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
--- 3,9 ----
  # This is combined with the information in the "Configuration" file
  # by the configure script to make the actual Makefile.
  
! CFLAGS+=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
  LIBS=$(EXTRA_LIBS) $(LIBS1)
  INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH0) $(EXTRA_INCLUDES)
  LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
