$OpenBSD: patch-Makefile,v 1.4 2006/02/05 15:08:43 david Exp $
--- Makefile.orig	2001-02-08 23:33:53.000000000 +0100
+++ Makefile	2004-01-05 00:34:41.000000000 +0100
@@ -6,9 +6,9 @@
 
 CHMOD=/bin/chmod
 CHOWN=/usr/sbin/chown
-GCC=gcc -O
-CFLAGS=-funsigned-char -Wall
-CC=${GCC} ${CFLAGS}
+#GCC=gcc -O
+CFLAGS+=-funsigned-char -Wall
+#CC=${GCC} ${CFLAGS}
 # Some systems contains resolver routines in libresolv
 # EXTRALIBS=lresolv
 EXTRALIBS=
@@ -34,7 +34,7 @@ SPY=tcpspy
 TBLDIR=/usr/local/share/proxy
 
 # config file location
-CONF_FILE=/etc/cyrproxy.conf
+CONF_FILE=%%SYSCONFDIR%%/cyrproxy.conf
 
 # Subdirs for make
 # cyrcoder - filter-like cyrillic recoder
@@ -65,7 +65,7 @@ all: ${CYRPROXY} ${SPY} subdirmake confi
 
 
 subdirmake:
-	@for i in ${SUBDIRS}; do echo "Making all in $$i" ;cd $$i; pmake all; cd ..; done
+	@for i in ${SUBDIRS}; do echo "Making all in $$i" ;cd $$i; ${MAKE} all; cd ..; done
 
 .SUFFIXES: .a .o .c
 
@@ -78,12 +78,12 @@ clean: clean-sub
 	rm -f config.gen cyrproxy.config.sample alldefs.h
 
 clean-sub:
-	@for i in ${SUBDIRS}; do echo "Make clean in $$i" ; cd $$i; pmake clean; cd .. ; done
+	@for i in ${SUBDIRS}; do echo "Make clean in $$i" ; cd $$i; ${MAKE} clean; cd .. ; done
 
 install: install-bin install-config install-tables install-sub
 
 install-sub:
-	@for i in ${SUBDIRS} ; do cd $$i ; pmake install; cd ..; done
+	@for i in ${SUBDIRS} ; do cd $$i ; ${MAKE} install; cd ..; done
 
 install-bin: ${CYRPROXY} ${SPY}
 	cp ${CYRPROXY} ${BINDIR}
@@ -128,7 +128,7 @@ alldefs.h: policy.h
 	awk '/^\#/{print $0}' <policy.h >alldefs.h
 
 config.gen: cyrproxy.conf.tmpl Makefile alldefs.h
-	${CC}  ${CFLAGS} -P -E - < cyrproxy.conf.tmpl | awk -f extranl.awk >config.gen
+	${CC}  ${CFLAGS} -P -E - < cyrproxy.conf.tmpl | sed -e '/^XCOMM /s//#/' -e '/^XCOMM$$/s//#/' |awk -f extranl.awk >config.gen
 
 ${CYRPROXY}: ${OBJS}
 	${CC} ${CFLAGS} ${LDFLAGS} -o ${CYRPROXY} ${OBJS} ${EXTRALIBS}