$NetBSD: patch-ad,v 1.5 2007/06/15 23:28:17 wiz Exp $

--- prayer/Makefile.orig	2006-04-11 12:31:57.000000000 +0000
+++ prayer/Makefile
@@ -12,7 +12,7 @@ endif
 
 # Default list of things to build
 BIN = prayer prayer-session prayer-ssl-prune prayer-cyclog prayer-sem-prune \
-  prayer-chroot
+  # prayer-chroot
 
 # Enable on the fly compression
 ifeq ($(strip $(GZIP_ENABLE)), true)
@@ -102,8 +102,8 @@ ifeq ($(strip $(CCLIENT_KERB_ENABLE)), t
   SESSION_LIBS += $(KERB_LIBS)
 endif
 
-CFLAGS  = $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
-LDFLAGS = $(BASELDFLAGS)
+CFLAGS  += $(BASECFLAGS) $(COMMON_SSL_INCLUDE) $(CCLIENT_INCLUDE)
+LDFLAGS += $(BASELDFLAGS)
 
 SHARED_OBJS = \
  pool.o list.o assoc.o memblock.o buffer.o string.o config.o user_agent.o \
@@ -174,21 +174,21 @@ clean:
 	-rm -f $(BIN) test core *.o *.flc *~ \#*\#
 
 install: all
-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
+	$(BSD_INSTALL_PROGRAM_DIR) \
 	  $(BROOT)$(BIN_DIR)
-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+	$(BSD_INSTALL_PROGRAM) \
 	  prayer           $(BROOT)$(BIN_DIR)
-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
-	  prayer-chroot           $(BROOT)$(BIN_DIR)
-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+#	$(BSD_INSTALL_PROGRAM) \
+#	  prayer-chroot           $(BROOT)$(BIN_DIR)
+	$(BSD_INSTALL_PROGRAM) \
 	  prayer-session   $(BROOT)$(BIN_DIR)
-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+	$(BSD_INSTALL_PROGRAM) \
 	  prayer-ssl-prune $(BROOT)$(BIN_DIR)
-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+	$(BSD_INSTALL_PROGRAM) \
 	  prayer-sem-prune $(BROOT)$(BIN_DIR)
-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+	$(BSD_INSTALL_SCRIPT) \
 	  prayer-db-prune $(BROOT)$(BIN_DIR)
-	$(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
+	$(BSD_INSTALL_SCRIPT) \
 	  prayer-cyclog    $(BROOT)$(BIN_DIR)
 
 prayer: $(PRAYER_OBJS) prayer_main.o
