--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/samba3oi/patches/makefile-in.patch	Tue Jun 14 13:59:11 2011 -0400
@@ -0,0 +1,120 @@
+--- source3/Makefile.in.orig	Sun Mar  6 13:48:05 2011
++++ source3/Makefile.in	Thu Jun  2 21:37:51 2011
+@@ -181,7 +181,7 @@
+ 	$(ISA) \
+ 	-I$(srcdir)/lib \
+ 	-I.. \
+-	-I../source4 \
++	-I$(srcdir)/../source4 \
+ 	-D_SAMBA_BUILD_=3
+ 
+ PATH_FLAGS = -DSMB_PASSWD_FILE=\"$(SMB_PASSWD_FILE)\" \
+@@ -1885,14 +1885,14 @@
+ 			$(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
+ 	fi
+ 	-$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include
++	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR)
++	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)$(INCLUDEDIR)
+ 
+ uninstalllibtalloc::
+ 	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
+ 	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
+ 	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)`
+-	-rm -f $(DESTDIR)${prefix}/include/talloc.h
++	-rm -f $(DESTDIR)$(INCLUDEDIR)/talloc.h
+ 
+ libs:: libtalloc
+ installlibs:: @INSTALL_LIBTALLOC@
+@@ -1965,14 +1965,14 @@
+ 			$(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
+ 	fi
+ 	-$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include
++	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR)
++	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)$(INCLUDEDIR)
+ 
+ uninstalllibtdb::
+ 	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
+ 	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)`
+ 	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_STATIC_TARGET)`
+-	-rm -f $(DESTDIR)${prefix}/include/tdb.h
++	-rm -f $(DESTDIR)$(INCLUDEDIR)/tdb.h
+ 
+ libs:: libtdb
+ installlibs:: @INSTALL_LIBTDB@
+@@ -2059,13 +2059,13 @@
+ 		ln -f -s `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
+ 			$(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
+ 	fi
+-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBWBCLIENT_HEADERS) $(DESTDIR)${prefix}/include
++	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR)
++	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBWBCLIENT_HEADERS) $(DESTDIR)$(INCLUDEDIR)
+ 
+ uninstalllibwbclient::
+ 	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
+ 	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)`
+-	-rm -f $(DESTDIR)${prefix}/include/wbclient.h
++	-rm -f $(DESTDIR)$(INCLUDEDIR)/wbclient.h
+ 
+ libs:: libwbclient
+ installlibs:: @INSTALL_LIBWBCLIENT@
+@@ -2236,14 +2236,14 @@
+ 			$(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
+ 	fi
+ 	-$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)${prefix}/include
++	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR)
++	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)$(INCLUDEDIR)
+ 
+ uninstalllibnetapi::
+ 	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
+ 	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET_SONAME)`
+ 	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_STATIC_TARGET)`
+-	-rm -f $(DESTDIR)${prefix}/include/netapi.h
++	-rm -f $(DESTDIR)$(INCLUDEDIR)/netapi.h
+ 
+ libs:: libnetapi
+ installlibs:: @INSTALL_LIBNETAPI@
+@@ -2314,8 +2314,8 @@
+ 			$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
+ 	fi
+ 	-$(INSTALLLIBCMD_A) $(LIBSMBCLIENT_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBCLIENT_HEADERS) $(DESTDIR)${prefix}/include
++	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR)
++	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBCLIENT_HEADERS) $(DESTDIR)$(INCLUDEDIR)
+ 
+ installclientlib:: installlibsmbclient
+ 
+@@ -2323,7 +2323,7 @@
+ 	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
+ 	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)`
+ 	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_STATIC_TARGET)`
+-	-rm -f $(DESTDIR)${prefix}/include/libsmbclient.h
++	-rm -f $(DESTDIR)$(INCLUDEDIR)/libsmbclient.h
+ 
+ uninstallclientlib:: uninstalllibsmbclient
+ 
+@@ -2399,14 +2399,14 @@
+ 			$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
+ 	fi
+ 	-$(INSTALLLIBCMD_A) $(LIBSMBSHAREMODES_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBSHAREMODES_HEADERS) $(DESTDIR)${prefix}/include
++	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(INCLUDEDIR)
++	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBSHAREMODES_HEADERS) $(DESTDIR)$(INCLUDEDIR)
+ 
+ uninstalllibsmbsharemodes::
+ 	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
+ 	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)`
+ 	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_STATIC_TARGET)`
+-	-rm -f $(DESTDIR)${prefix}/include/smb_share_modes.h
++	-rm -f $(DESTDIR)$(INCLUDEDIR)/smb_share_modes.h
+ 
+ libs:: libsmbsharemodes
+ installlibs:: @INSTALL_LIBSMBSHAREMODES@