--- src/Makefile.tmpl.orig	Thu Apr  9 10:40:12 1998
+++ src/Makefile.tmpl	Thu Apr  9 11:02:30 1998
@@ -3,7 +3,7 @@
 # This is combined with the information in the "Configuration" file
 # by the configure script to make the actual Makefile.
 
-CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
+CFLAGS+=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
 LIBS=$(EXTRA_LIBS) $(LIBS1)
 INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
 LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
@@ -37,11 +37,11 @@
 	$(CC) $(LFLAGS) -o gcache gcache.o gcachecommon.o $(LIBS)
 
 certificate:
-	$(SSL_APP_DIR)/ssleay req -config $(SSL_APP_DIR)/ssleay.cnf \
+	$(SSL_APP_DIR)/ssleay req -config $(SSL_BASE)/etc/ssleay.cnf \
 	-new -x509 -nodes -out ../SSLconf/conf/httpsd.pem \
 	-keyout ../SSLconf/conf/httpsd.pem; \
 	ln -sf ../SSLconf/conf/httpsd.pem ../SSLconf/conf/`$(SSL_APP_DIR)/ssleay \
-	x509 -noout -hash < ../SSLconf/conf/httpsd.pem`.0
+  	x509 -noout -hash < ../SSLconf/conf/httpsd.pem`.0
 
 regex/libregex.a:
 	(cd regex; $(MAKE) lib CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
