$NetBSD: patch-aa,v 1.4 2005/08/28 12:36:42 recht Exp $

--- gnats/Makefile.in.orig	2005-02-24 21:35:55.000000000 +0100
+++ gnats/Makefile.in	2005-08-28 14:24:22.000000000 +0200
@@ -93,7 +93,7 @@
 
 INSTALL = $(srcdir)/../install-sh -c
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_DATA = @INSTALL_DATA@
 
 SUB_INSTALL = `echo $(INSTALL) | sed 's,^\([^/]\),../\1,'`
@@ -250,7 +250,7 @@
 
 mkcat: mkcat.sh Makefile
 	@echo Creating mkcat...
-	@cat $(srcdir)/mkcat.sh > $@-t
+	@sed -e 's,xBINDIRx,$(bindir),g' $(srcdir)/mkcat.sh > $@-t
 	@mv $@-t $@
 	@chmod a+x $@
 
@@ -265,7 +265,7 @@
 
 rmcat: rmcat.sh Makefile
 	@echo Creating rmcat...
-	@cat $(srcdir)/rmcat.sh > $@-t
+	@sed -e 's,xBINDIRx,$(bindir),g' $(srcdir)/rmcat.sh > $@-t
 	@mv $@-t $@
 	@chmod a+x $@
 
@@ -369,7 +369,7 @@
 
 install-tools-arch-indep: all-tools
 	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(datadir)/gnats
-	$(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(sysconfdir)/gnats/defaults
+	$(SHELL) $(srcdir)/../mkinstalldirs %%GNATS_DEFAULTS%%
 	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
 	  echo "chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats" ; \
 	  chown $(GNATS_USER) $(DESTDIR)$(datadir)/gnats ; \
@@ -379,9 +379,9 @@
 	$(INSTALL_DATA) $(srcdir)/gnats.el $(DESTDIR)$(lispdir)/gnats.el
 	for i in categories submitters responsible gnatsd.user_access addresses states classes dbconfig ; do \
 	    if [ -f "$$i" ] ; then \
-		$(INSTALL_DATA) $$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \
+		$(INSTALL_DATA) $$i %%GNATS_DEFAULTS%%/$$i ; \
 	    else \
-		$(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/gnats/defaults/$$i ; \
+		$(INSTALL_DATA) $(srcdir)/$$i %%GNATS_DEFAULTS%%/$$i ; \
 	    fi ; \
 	done
 
@@ -391,17 +391,9 @@
 	$(INSTALL_SCRIPT) edit-pr $(DESTDIR)$(bindir)/edit-pr
 	$(INSTALL_SCRIPT) diff-prs $(DESTDIR)$(libexecdir)/gnats/diff-prs
 	$(INSTALL_SCRIPT) mail-agent $(DESTDIR)$(libexecdir)/gnats/mail-agent
-	$(INSTALL_PROGRAM) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
+	$(INSTALL_SCRIPT) file-pr $(DESTDIR)$(libexecdir)/gnats/file-pr
 	$(INSTALL_PROGRAM) pr-age $(DESTDIR)$(libexecdir)/gnats/pr-age
 	$(INSTALL_PROGRAM) pr-edit $(DESTDIR)$(libexecdir)/gnats/pr-edit
-	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
-	  echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/pr-edit" ; \
-	  echo "chmod 4555 $(DESTDIR)$(libexecdir)/gnats/pr-edit" ; \
-	  chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/pr-edit ; \
-	  chmod 4555 $(DESTDIR)$(libexecdir)/gnats/pr-edit ; \
-        else \
-	  echo "*** Warning: Must make pr-edit suid $(DESTDIR)$(GNATS_USER)" ; \
-	fi
 
 EXTRA_INSTALL =
 
@@ -409,29 +401,42 @@
 install-gnats-arch-dep: install-gnats-bin $(EXTRA_INSTALL)
 
 install-gnats-arch-indep: all-gnats install-tools-arch-indep
-	@if [ -f $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ]; then \
-	  echo "Not putting gnats-databases file in $(DESTDIR)$(GLOBAL_DB_LIST_FILE), it's already there." ; \
+	@if [ -f %%EGDIR%%/databases ]; then \
+	  echo "Not putting gnats-databases file in %%EGDIR%%/databases, it's already there." ; \
 	  true ; \
 	else \
 	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
 	    $(INSTALL_DATA) -o $(GNATS_USER) gnats-databases \
-	                    $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
+	                    %%EGDIR%%/databases ; \
 	  else \
-	    $(INSTALL_DATA) gnats-databases $(DESTDIR)$(GLOBAL_DB_LIST_FILE) ; \
-	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GLOBAL_DB_LIST_FILE)" ; \
+	    $(INSTALL_DATA) gnats-databases %%EGDIR%%/databases ; \
+	    echo "*** Warning: Must chown $(GNATS_USER) %%EGDIR%%/databases" ; \
 	  fi \
 	fi
-	@if [ -f $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ]; then \
-	   echo "Not putting gnats.host_access file in $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE), it's already there." ; \
+	@if [ -f %%EGDIR%%/gnatsd.host_access ]; then \
+	   echo "Not putting gnats.host_access file in %%EGDIR%%/gnatsd.host_access, it's already there." ; \
 	   true ; \
 	else \
 	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
 	    $(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.host_access \
-	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
+	                    %%EGDIR%%/gnatsd.host_access ; \
           else \
 	    $(INSTALL_DATA) $(srcdir)/gnatsd.host_access \
-	                    $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE) ; \
-	    echo "*** Warning: Must chown $(GNATS_USER) $(DESTDIR)$(GNATSD_HOST_ACCESS_FILE)" ; \
+	                    %%EGDIR%%/gnatsd.host_access ; \
+	    echo "*** Warning: Must chown $(GNATS_USER) %%EGDIR%%/gnatsd.host_access" ; \
+	  fi \
+	fi
+	@if [ -f %%EGDIR%%/gnatsd.user_access ]; then \
+	   echo "Not putting gnats.user_access file in %%EGDIR%%/gnatsd.user_access, it's already there." ; \
+	   true ; \
+	else \
+	  if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
+	    $(INSTALL_DATA) -o $(GNATS_USER) $(srcdir)/gnatsd.user_access \
+	                    %%EGDIR%%/gnatsd.user_access ; \
+          else \
+	    $(INSTALL_DATA) $(srcdir)/gnatsd.user_access \
+	                    %%EGDIR%%/gnatsd.user_access ; \
+	    echo "*** Warning: Must chown $(GNATS_USER) %%EGDIR%%/gnatsd.user_access" ; \
 	  fi \
 	fi
 	@echo "*** If you're a first-time user, you'll want to create a new database";
@@ -450,20 +455,6 @@
 	$(INSTALL_PROGRAM) gen-index $(DESTDIR)$(libexecdir)/gnats/gen-index
 	$(INSTALL_SCRIPT) mail-query $(DESTDIR)$(libexecdir)/gnats/mail-query
 	$(INSTALL_PROGRAM) gnats-pwconv $(DESTDIR)$(libexecdir)/gnats/gnats-pwconv
-	@if [ `whoami` = root -o `whoami` = $(GNATS_USER) ] ; then \
-	  echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/queue-pr $(DESTDIR)$(libexecdir)/gnats/file-pr $(DESTDIR)$(libexecdir)/gnats/gen-index" ; \
-	  echo "chmod 4555 $(DESTDIR)$(libexecdir)/gnats/queue-pr $(DESTDIR)$(libexecdir)/gnats/file-pr $(DESTDIR)$(libexecdir)/gnats/gen-index" ; \
-	  echo "chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/gnatsd" ; \
-	  echo "chmod 555 $(DESTDIR)$(libexecdir)/gnats/gnatsd" ; \
-	  chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/queue-pr ; \
-	  chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/gen-index ; \
-	  chmod 4555 $(DESTDIR)$(libexecdir)/gnats/queue-pr ; \
-	  chmod 4555 $(DESTDIR)$(libexecdir)/gnats/gen-index ; \
-	  chown $(GNATS_USER) $(DESTDIR)$(libexecdir)/gnats/gnatsd ; \
-	  chmod 555 $(DESTDIR)$(libexecdir)/gnats/gnatsd ; \
-	else \
-	  echo "*** Warning: must make queue-pr and gen-index suid $(GNATS_USER)." ; \
-	fi
 
 # regex.c is pretty badly broken, and I don't feel like fixing it.
 regex.o: $(srcdir)/regex.c