# This patch alters various Makefiles to write files into our patched
# locations. Needed for the std-directories patch, and to allow for
# doing "make install"s as a non-root user when building a package.
# 
# Japheth Cleaver
# <cleaver@rohan.sdsu.edu>
# 

# automake needs to be re-run after applying this patch

--- Makefile.am.orig	2005-01-03 01:52:48.000000000 -0800
+++ Makefile.am	2005-01-03 01:55:10.000000000 -0800
@@ -13,16 +13,16 @@
 INSTALL_PROGRAM= ${INSTALL} -o @vpopuser@ -m 711 -g @vpopgroup@ $(AM_INSTALL_PROGRAM_FLAGS)
 INSTALL_STRIP_PROGRAM=${INSTALL_PROGRAM} -s
 
-MYSQLCONF=$(DESTDIR)@vpopmaildir@/etc/vpopmail.mysql
-VLIMITS=$(DESTDIR)@vpopmaildir@/etc/vlimits.default
+MYSQLCONF=$(DESTDIR)$(sysconfdir)/vpopmail.mysql
+VLIMITS=$(DESTDIR)$(sysconfdir)/vlimits.default
 
 noinst_LIBRARIES=libvpopmail.a
 
 libvpopmail_a_SOURCES=$(COMMONSOURCES) 
 libvpopmail_a_LIBADD =  cdb/*.o
 libvpopmail_a_CFLAGS = -fPIC

-vpopmailbindir=@vpopmaildir@/bin
+vpopmailbindir=$(sbindir)
 vpopmailbin_PROGRAMS = vchkpw vdelivermail clearopensmtp vadddomain \
  vdeldomain vpasswd vadduser vdeluser vaddaliasdomain vsetuserquota \
  vpopbull vdeloldusers vmoduser valias vuserinfo vmkpasswd vipmap \
@@ -111,9 +111,9 @@
 	$(INSTALL) -d -g @vpopgroup@ -m 0700 -o @vpopuser@ \
 	  $(DESTDIR)@vpopmaildir@/@domains_dir@
 
-	echo "-I@vpopmaildir@/include" > \
+	echo "-I$(includedir) -I@vpopmaildir@/include" > \
 	 $(DESTDIR)@vpopmaildir@/etc/inc_deps
-	echo "-L@vpopmaildir@/lib -lvpopmail @auth_libs@ @LIBS@" > \
+	echo "-L$(libdir) -L@vpopmaildir@/lib -lvpopmail @auth_libs@ @LIBS@" > \
 	 $(DESTDIR)@vpopmaildir@/etc/lib_deps
 
 	if test ! -r $(VLIMITS); then \
@@ -128,14 +128,14 @@
 	fi
 
 	$(INSTALL) -o root -m 0644 \
-	  libvpopmail.a $(DESTDIR)@vpopmaildir@/lib/libvpopmail.a
+	  libvpopmail.a $(DESTDIR)$(libdir)/libvpopmail.a
 
 	$(INSTALL) -o root -m 0444 \
-	  config.h $(DESTDIR)@vpopmaildir@/include/vpopmail_config.h
+	  config.h $(DESTDIR)$(includedir)/vpopmail_config.h
 
 	for include in vpopmail.h config.h vauth.h vlimits.h ; do \
 	    $(INSTALL) -o root -m 0444 $$include \
-		$(DESTDIR)@vpopmaildir@/include/ ; \
+		$(DESTDIR)$(includedir) ; \
 	done
 
 	$(INSTALL) -d $(DESTDIR)@vpopmaildir@/doc/man_html