diff -ruN courier-authlib-0.50.20041103.orig/Makefile.am courier-authlib-0.50.20041103/Makefile.am

--- courier-authlib-0.50.20041103.orig/Makefile.am	2004-11-04 12:54:28 +1000

+++ courier-authlib-0.50.20041103/Makefile.am	2004-11-23 14:53:40 +1000

@@ -140,8 +140,6 @@

 	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@`

 	$(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \

 		$(DESTDIR)@authpgsqlrc@.dist

-	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist

 uninstall-authpgsqlrc:

 	rm -f $(DESTDIR)@authpgsqlrc@.dist

@@ -175,8 +173,6 @@

 	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` 

 	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \

 		$(DESTDIR)@authldaprc@.dist

-	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist

 uninstall-authldaprc:

 	rm -f $(DESTDIR)@authldaprc@.dist

@@ -208,8 +204,6 @@

 	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@`

 	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \

 		$(DESTDIR)@authmysqlrc@.dist

-	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist

 uninstall-authmysqlrc:

 	rm -f $(DESTDIR)@authmysqlrc@.dist

@@ -258,8 +252,6 @@

 	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp

 	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist

 	rm -f authdaemonrc.tmp

-	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist

 uninstall-authdaemonrc:

 	rm -f $(DESTDIR)@authdaemonrc@.dist

@@ -267,9 +259,9 @@

 authdaemonrc.h:

 	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h

 	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONPID \"/var/run/courier-authdaemon.pid\"" >>authdaemonrc.h

 	echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONLOCK \"/var/lock/subsys/courier-authdaemon\"" >>authdaemonrc.h

 HTMLFILES=README.html NEWS.html INSTALL.html \

 		README.authmysql.html README.authpostgres.html

@@ -390,8 +382,6 @@

 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond

 	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@

 	chmod 750 $(DESTDIR)@authdaemonvar@

-	-chown @mailuser@ $(DESTDIR)@authdaemonvar@

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@

 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\

 		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \

 				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \

diff -ruN courier-authlib-0.50.20041103.orig/Makefile.in courier-authlib-0.50.20041103/Makefile.in

--- courier-authlib-0.50.20041103.orig/Makefile.in	2004-11-04 12:54:59 +1000

+++ courier-authlib-0.50.20041103/Makefile.in	2004-11-23 14:56:58 +1000

@@ -1435,8 +1435,6 @@

 @HAVE_AUTHPGSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authpgsqlrc@`

 @HAVE_AUTHPGSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authpgsqlrc \

 @HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)@authpgsqlrc@.dist

-@HAVE_AUTHPGSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist

-@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist

 @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:

 @HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist

@@ -1456,8 +1454,6 @@

 @HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` 

 @HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \

 @HAVE_LDAP_TRUE@		$(DESTDIR)@authldaprc@.dist

-@HAVE_LDAP_TRUE@	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist

-@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist

 @HAVE_LDAP_TRUE@uninstall-authldaprc:

 @HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist

@@ -1477,8 +1473,6 @@

 @HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@`

 @HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \

 @HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)@authmysqlrc@.dist

-@HAVE_AUTHMYSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist

-@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist

 @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:

 @HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist

@@ -1497,8 +1491,6 @@

 	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp

 	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.dist

 	rm -f authdaemonrc.tmp

-	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist

 uninstall-authdaemonrc:

 	rm -f $(DESTDIR)@authdaemonrc@.dist

@@ -1506,9 +1498,9 @@

 authdaemonrc.h:

 	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h

 	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONPID AUTHDAEMONVAR \"/pid\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONPID \"/var/run/courier-authdaemon.pid\"" >>authdaemonrc.h

 	echo "#define AUTHDAEMONSOCK AUTHDAEMONVAR \"/socket\"" >>authdaemonrc.h

-	echo "#define AUTHDAEMONLOCK AUTHDAEMONVAR \"/lock\"" >>authdaemonrc.h

+	echo "#define AUTHDAEMONLOCK \"/var/lock/subsys-authdaemon\"" >>authdaemonrc.h

 README: README.html

 	links -dump README.html >README

@@ -1551,8 +1543,6 @@

 	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond

 	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@

 	chmod 750 $(DESTDIR)@authdaemonvar@

-	-chown @mailuser@ $(DESTDIR)@authdaemonvar@

-	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@

 	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\

 		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) makedat/makedatprog \

 				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \

diff -ruN courier-authlib-0.50.20041120.orig/Makefile.in courier-authlib-0.50.20041120/Makefile.in

--- courier-authlib-0.50.20041120.orig/Makefile.in	2004-11-23 17:57:13 +1000

+++ courier-authlib-0.50.20041120/Makefile.in	2004-11-23 18:01:39 +1000

@@ -1015,12 +1015,12 @@

 	done

 install-includeHEADERS: $(include_HEADERS)

 	@$(NORMAL_INSTALL)

-	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)"

+	test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)/@PACKAGE@"

 	@list='$(include_HEADERS)'; for p in $$list; do \

 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

 	  f="`echo $$p | sed -e 's|^.*/||'`"; \

-	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \

-	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \

+	  echo " $(includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/@PACKAGE@/$$f'"; \

+	  $(includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/@PACKAGE@/$$f"; \

 	done

 uninstall-includeHEADERS: