[svn:dbd-oracle] r13713 - dbd-oracle/branches/DBDOracle8

[email protected]
Newsgroups perl.dbd.oracle.changes
Message-ID <[email protected]>
Author: byterock
Date: Thu Jan  7 17:04:48 2010
New Revision: 13713

Added:
   dbd-oracle/branches/DBDOracle8/Oracle8.pm
      - copied unchanged from r13712, /dbd-oracle/branches/DBDOracle8/Oracle.pm
Removed:
   dbd-oracle/branches/DBDOracle8/Oracle.pm
Modified:
   dbd-oracle/branches/DBDOracle8/Makefile
   dbd-oracle/branches/DBDOracle8/Makefile.PL
   dbd-oracle/branches/DBDOracle8/Oracle.obj
   dbd-oracle/branches/DBDOracle8/dbdimp.obj
   dbd-oracle/branches/DBDOracle8/mk.pm
   dbd-oracle/branches/DBDOracle8/oci8.obj
   dbd-oracle/branches/DBDOracle8/vc70.pdb

Log:


Modified: dbd-oracle/branches/DBDOracle8/Makefile
==============================================================================
--- dbd-oracle/branches/DBDOracle8/Makefile	(original)
+++ dbd-oracle/branches/DBDOracle8/Makefile	Thu Jan  7 17:04:48 2010
@@ -1,28 +1,28 @@
-# This Makefile is for the DBD::Oracle extension to perl.
+# This Makefile is for the DBD::Oracle8 extension to perl.
 #
 # It was generated automatically by MakeMaker version
-# 5.45 (Revision: 1.222) from the contents of
+# 6.3201 (Revision: 19606) from the contents of
 # Makefile.PL. Don't edit this file, edit Makefile.PL instead.
 #
-#	ANY CHANGES MADE HERE WILL BE LOST!
+#       ANY CHANGES MADE HERE WILL BE LOST!
 #
 #   MakeMaker ARGV: ()
 #
 #   MakeMaker Parameters:
 
-#	ABSTRACT_FROM => q[Oracle.pm]
-#	AUTHOR => q[Tim Bunce ([email protected])]
-#	DEFINE => q[ -DUTF8_SUPPORT -DNEW_OCI_INIT -DORA_OCI_VERSION=\"10.1.0.4\"]
-#	DIR => []
-#	EXE_FILES => [q[ora_explain]]
-#	INC => q[-Ic:/instant10.1/sdk/include -Ic:/instant10.1/rdbms/demo -IC:/Perl/site/lib/auto/DBI/]
-#	LIBS => [q[-Lc:/instant10.1/sdk/LIB/MSVC OCI]]
-#	NAME => q[DBD::Oracle]
-#	OBJECT => q[$(O_FILES)]
-#	PREREQ_PM => { DBI=>q[0] }
-#	VERSION_FROM => q[Oracle.pm]
-#	clean => { FILES=>q[xstmp.c Oracle.xsi dll.base dll.exp sqlnet.log libOracle.def ora_explain mk.pm DBD_ORA_OBJ.*] }
-#	dist => { DIST_DEFAULT=>q[clean distcheck disttest tardist], PREOP=>q[$(MAKE) -f Makefile.old distdir], COMPRESS=>q[gzip -v9], SUFFIX=>q[gz] }
+#     ABSTRACT_FROM => q[Oracle8.pm]
+#     AUTHOR => q[Tim Bunce ([email protected])]
+#     DEFINE => q[ -DUTF8_SUPPORT -DORA_OCI_VERSION=\"8.1.7.0\"]
+#     DIR => []
+#     EXE_FILES => [q[ora_explain]]
+#     INC => q[-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/]
+#     LIBS => [q[-LD:/oracle/ora81/oci/LIB/MSVC OCI]]
+#     NAME => q[DBD::Oracle8]
+#     OBJECT => q[$(O_FILES)]
+#     PREREQ_PM => { DBI=>q[0] }
+#     VERSION_FROM => q[Oracle8.pm]
+#     clean => { FILES=>q[xstmp.c Oracle.xsi dll.base dll.exp sqlnet.log libOracle.def ora_explain mk.pm DBD_ORA_OBJ.*] }
+#     dist => { DIST_DEFAULT=>q[clean distcheck disttest tardist], COMPRESS=>q[gzip -v9], PREOP=>q[$(MAKE) -f Makefile.old distdir], SUFFIX=>q[gz] }
 
 # --- MakeMaker post_initialize section:
 
@@ -38,6 +38,8 @@
 CCDLFLAGS =  
 DLEXT = dll
 DLSRC = dl_win32.xs
+EXE_EXT = .exe
+FULL_AR = 
 LD = link
 LDDLFLAGS = -dll -nologo -nodefaultlib -debug -opt:ref,icf  -libpath:"C:\Perl\lib\CORE"  -machine:x86
 LDFLAGS = -nologo -nodefaultlib -debug -opt:ref,icf  -libpath:"C:\Perl\lib\CORE"  -machine:x86
@@ -45,127 +47,165 @@
 LIB_EXT = .lib
 OBJ_EXT = .obj
 OSNAME = MSWin32
-OSVERS = 4.0
+OSVERS = 5.00
 RANLIB = rem
+SITELIBEXP = C:\Perl\site\lib
+SITEARCHEXP = C:\Perl\site\lib
 SO = dll
-EXE_EXT = .exe
-FULL_AR = 
+VENDORARCHEXP = 
+VENDORLIBEXP = 
 
 
 # --- MakeMaker constants section:
 AR_STATIC_ARGS = cr
-NAME = DBD::Oracle
-DISTNAME = DBD-Oracle
-NAME_SYM = DBD_Oracle
-VERSION = 1.17
-VERSION_SYM = 1_17
-XS_VERSION = 1.17
-INST_BIN = blib\bin
-INST_EXE = blib\script
-INST_LIB = blib\lib
+DIRFILESEP = ^\
+DFSEP = $(DIRFILESEP)
+NAME = DBD::Oracle8
+NAME_SYM = DBD_Oracle8
+VERSION = 1.00
+VERSION_MACRO = VERSION
+VERSION_SYM = 1_00
+DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
+XS_VERSION = 1.00
+XS_VERSION_MACRO = XS_VERSION
+XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
 INST_ARCHLIB = blib\arch
 INST_SCRIPT = blib\script
-PREFIX = C:\Perl
+INST_BIN = blib\bin
+INST_LIB = blib\lib
+INST_MAN1DIR = blib\man1
+INST_MAN3DIR = blib\man3
+INST_HTMLDIR = blib\html
+MAN1EXT = 1
+MAN3EXT = 3
 INSTALLDIRS = site
-INSTALLPRIVLIB = $(PREFIX)\lib
-INSTALLARCHLIB = $(PREFIX)\lib
+DESTDIR = 
+PREFIX = $(SITEPREFIX)
+PERLPREFIX = C:\Perl
+SITEPREFIX = C:\Perl\site
+VENDORPREFIX = 
+INSTALLPRIVLIB = C:\Perl\lib
+DESTINSTALLPRIVLIB = $(DESTDIR)$(INSTALLPRIVLIB)
 INSTALLSITELIB = C:\Perl\site\lib
+DESTINSTALLSITELIB = $(DESTDIR)$(INSTALLSITELIB)
+INSTALLVENDORLIB = 
+DESTINSTALLVENDORLIB = $(DESTDIR)$(INSTALLVENDORLIB)
+INSTALLARCHLIB = C:\Perl\lib
+DESTINSTALLARCHLIB = $(DESTDIR)$(INSTALLARCHLIB)
 INSTALLSITEARCH = C:\Perl\site\lib
-INSTALLBIN = $(PREFIX)\bin
-INSTALLSCRIPT = $(PREFIX)\bin
+DESTINSTALLSITEARCH = $(DESTDIR)$(INSTALLSITEARCH)
+INSTALLVENDORARCH = 
+DESTINSTALLVENDORARCH = $(DESTDIR)$(INSTALLVENDORARCH)
+INSTALLBIN = C:\Perl\bin
+DESTINSTALLBIN = $(DESTDIR)$(INSTALLBIN)
+INSTALLSITEBIN = C:\Perl\site\bin
+DESTINSTALLSITEBIN = $(DESTDIR)$(INSTALLSITEBIN)
+INSTALLVENDORBIN = 
+DESTINSTALLVENDORBIN = $(DESTDIR)$(INSTALLVENDORBIN)
+INSTALLSCRIPT = C:\Perl\bin
+DESTINSTALLSCRIPT = $(DESTDIR)$(INSTALLSCRIPT)
+INSTALLSITESCRIPT = C:\Perl\site\bin
+DESTINSTALLSITESCRIPT = $(DESTDIR)$(INSTALLSITESCRIPT)
+INSTALLVENDORSCRIPT = 
+DESTINSTALLVENDORSCRIPT = $(DESTDIR)$(INSTALLVENDORSCRIPT)
+INSTALLMAN1DIR = C:\Perl\man\man1
+DESTINSTALLMAN1DIR = $(DESTDIR)$(INSTALLMAN1DIR)
+INSTALLSITEMAN1DIR = $(INSTALLMAN1DIR)
+DESTINSTALLSITEMAN1DIR = $(DESTDIR)$(INSTALLSITEMAN1DIR)
+INSTALLVENDORMAN1DIR = 
+DESTINSTALLVENDORMAN1DIR = $(DESTDIR)$(INSTALLVENDORMAN1DIR)
+INSTALLMAN3DIR = C:\Perl\man\man3
+DESTINSTALLMAN3DIR = $(DESTDIR)$(INSTALLMAN3DIR)
+INSTALLSITEMAN3DIR = $(INSTALLMAN3DIR)
+DESTINSTALLSITEMAN3DIR = $(DESTDIR)$(INSTALLSITEMAN3DIR)
+INSTALLVENDORMAN3DIR = 
+DESTINSTALLVENDORMAN3DIR = $(DESTDIR)$(INSTALLVENDORMAN3DIR)
+INSTALLHTMLDIR = C:\Perl\html
+DESTINSTALLHTMLDIR = $(DESTDIR)$(INSTALLHTMLDIR)
+INSTALLSITEHTMLDIR = C:\Perl\html
+DESTINSTALLSITEHTMLDIR = $(DESTDIR)$(INSTALLSITEHTMLDIR)
+INSTALLVENDORHTMLDIR = C:\Perl\html
+DESTINSTALLVENDORHTMLDIR = $(DESTDIR)$(INSTALLVENDORHTMLDIR)
 PERL_LIB = C:\Perl\lib
 PERL_ARCHLIB = C:\Perl\lib
-SITELIBEXP = C:\Perl\site\lib
-SITEARCHEXP = C:\Perl\site\lib
 LIBPERL_A = libperl.lib
 FIRST_MAKEFILE = Makefile
+MAKEFILE_OLD = Makefile.old
 MAKE_APERL_FILE = Makefile.aperl
 PERLMAINCC = $(CC)
 PERL_INC = C:\Perl\lib\CORE
 PERL = C:\Perl\bin\perl.exe
 FULLPERL = C:\Perl\bin\perl.exe
-
-VERSION_MACRO = VERSION
-DEFINE_VERSION = -D$(VERSION_MACRO)=\"$(VERSION)\"
-XS_VERSION_MACRO = XS_VERSION
-XS_DEFINE_VERSION = -D$(XS_VERSION_MACRO)=\"$(XS_VERSION)\"
-
-MAKEMAKER = 
-MM_VERSION = 5.45
+ABSPERL = $(PERL)
+PERLRUN = $(PERL)
+FULLPERLRUN = $(FULLPERL)
+ABSPERLRUN = $(ABSPERL)
+PERLRUNINST = $(PERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"
+FULLPERLRUNINST = $(FULLPERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"
+ABSPERLRUNINST = $(ABSPERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"
+PERL_CORE = 0
+PERM_RW = 644
+PERM_RWX = 755
+
+MAKEMAKER   = C:/Perl/lib/ExtUtils/MakeMaker.pm
+MM_VERSION  = 6.3201
+MM_REVISION = 19606
 
 # FULLEXT = Pathname for extension directory (eg Foo/Bar/Oracle).
 # BASEEXT = Basename part of FULLEXT. May be just equal FULLEXT. (eg Oracle)
-# ROOTEXT = Directory part of FULLEXT with leading slash (eg /DBD)  !!! Deprecated from MM 5.32  !!!
 # PARENT_NAME = NAME without BASEEXT and no trailing :: (eg Foo::Bar)
 # DLBASE  = Basename part of dynamic library. May be just equal BASEEXT.
-FULLEXT = DBD\Oracle
-BASEEXT = Oracle
+MAKE = nmake
+FULLEXT = DBD\Oracle8
+BASEEXT = Oracle8
 PARENT_NAME = DBD
 DLBASE = $(BASEEXT)
-VERSION_FROM = Oracle.pm
-INC = -Ic:/instant10.1/sdk/include -Ic:/instant10.1/rdbms/demo -IC:/Perl/site/lib/auto/DBI/
-DEFINE =  -DUTF8_SUPPORT -DNEW_OCI_INIT -DORA_OCI_VERSION=\"10.1.0.4\"
+VERSION_FROM = Oracle8.pm
+INC = -ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/
+DEFINE =  -DUTF8_SUPPORT -DORA_OCI_VERSION=\"8.1.7.0\"
 OBJECT = $(O_FILES)
 LDFROM = $(OBJECT)
 LINKTYPE = dynamic
+BOOTDEP = 
 
 # Handy lists of source code files:
-XS_FILES= Oracle.xs
-C_FILES = Oracle.c \
+XS_FILES = Oracle.xs
+C_FILES  = Oracle.c \
 	dbdimp.c \
 	oci8.c
-O_FILES = Oracle.obj \
+O_FILES  = Oracle.obj \
 	dbdimp.obj \
 	oci8.obj
-H_FILES = Oracle.h \
+H_FILES  = Oracle.h \
 	dbdimp.h \
 	dbivport.h \
 	ocitrace.h
-HTMLLIBPODS    = 
-HTMLSCRIPTPODS = 
-MAN1PODS = 
-MAN3PODS = 
-HTMLEXT = html
-INST_MAN1DIR = 
-INSTALLMAN1DIR = 
-MAN1EXT = 1
-INST_MAN3DIR = 
-INSTALLMAN3DIR = 
-MAN3EXT = 3
-
-# work around a famous dec-osf make(1) feature(?):
-makemakerdflt: all
-
-.SUFFIXES: .xs .c .C .cpp .cxx .cc $(OBJ_EXT)
-
-# Nick wanted to get rid of .PRECIOUS. I don't remember why. I seem to recall, that
-# some make implementations will delete the Makefile when we rebuild it. Because
-# we call false(1) when we rebuild it. So make(1) is not completely wrong when it
-# does so. Our milage may vary.
-# .PRECIOUS: Makefile    # seems to be not necessary anymore
-
-.PHONY: all config static dynamic test linkext manifest
+MAN1PODS = ora_explain
+MAN3PODS = Oracle8.pm \
+	Oraperl.pm
 
 # Where is the Config information that we are using/depend on
-CONFIGDEP = $(PERL_ARCHLIB)\Config.pm $(PERL_INC)\config.h
+CONFIGDEP = $(PERL_ARCHLIB)$(DFSEP)Config.pm $(PERL_INC)$(DFSEP)config.h
 
-# Where to put things:
+# Where to build things
 INST_LIBDIR      = $(INST_LIB)\DBD
 INST_ARCHLIBDIR  = $(INST_ARCHLIB)\DBD
 
 INST_AUTODIR     = $(INST_LIB)\auto\$(FULLEXT)
 INST_ARCHAUTODIR = $(INST_ARCHLIB)\auto\$(FULLEXT)
 
-INST_STATIC  = $(INST_ARCHAUTODIR)\$(BASEEXT)$(LIB_EXT)
-INST_DYNAMIC = $(INST_ARCHAUTODIR)\$(DLBASE).$(DLEXT)
-INST_BOOT    = $(INST_ARCHAUTODIR)\$(BASEEXT).bs
+INST_STATIC      = $(INST_ARCHAUTODIR)\$(BASEEXT)$(LIB_EXT)
+INST_DYNAMIC     = $(INST_ARCHAUTODIR)\$(DLBASE).$(DLEXT)
+INST_BOOT        = $(INST_ARCHAUTODIR)\$(BASEEXT).bs
+
+# Extra linker info
+EXPORT_LIST        = $(BASEEXT).def
+PERL_ARCHIVE       = $(PERL_INC)\perl58.lib
+PERL_ARCHIVE_AFTER = 
 
-EXPORT_LIST = Oracle.def
-
-PERL_ARCHIVE = $(PERL_INC)\perl56.lib
 
 TO_INST_PM = Oracle.h \
-	Oracle.pm \
+	Oracle8.pm \
 	Oraperl.pm \
 	dbdimp.h \
 	lib/DBD/Oracle/GetInfo.pm \
@@ -173,106 +213,95 @@
 	ocitrace.h \
 	oraperl.ph
 
-PM_TO_BLIB = lib/DBD/Oracle/GetInfo.pm \
-	$(INST_LIB)\DBD\Oracle\GetInfo.pm \
-	Oracle.pm \
-	$(INST_LIBDIR)\Oracle.pm \
+PM_TO_BLIB = Oracle.h \
+	$(INST_ARCHAUTODIR)/Oracle.h \
+	Oracle8.pm \
+	$(INST_LIB)\DBD\Oracle8.pm \
 	dbdimp.h \
 	$(INST_ARCHAUTODIR)/dbdimp.h \
-	mk.pm \
-	$(INST_ARCHAUTODIR)/mk.pm \
-	ocitrace.h \
-	$(INST_ARCHAUTODIR)/ocitrace.h \
-	Oracle.h \
-	$(INST_ARCHAUTODIR)/Oracle.h \
 	oraperl.ph \
 	$(INST_LIB)/oraperl.ph \
+	ocitrace.h \
+	$(INST_ARCHAUTODIR)/ocitrace.h \
 	Oraperl.pm \
-	$(INST_LIB)/Oraperl.pm
+	$(INST_LIB)/Oraperl.pm \
+	lib/DBD/Oracle/GetInfo.pm \
+	blib\lib\DBD\Oracle\GetInfo.pm \
+	mk.pm \
+	$(INST_ARCHAUTODIR)/mk.pm
 
 
-# --- MakeMaker tool_autosplit section:
+# --- MakeMaker platform_constants section:
+MM_Win32_VERSION = 1.1401
+
 
+# --- MakeMaker tool_autosplit section:
 # Usage: $(AUTOSPLITFILE) FileToSplit AutoDirToSplitInto
-AUTOSPLITFILE = $(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" -MAutoSplit  -e "autosplit($$ARGV[0], $$ARGV[1], 0, 1, 1);"
+AUTOSPLITFILE = $(ABSPERLRUN)  -e "use AutoSplit;  autosplit($$ARGV[0], $$ARGV[1], 0, 1, 1)" --
+
 
 
 # --- MakeMaker tool_xsubpp section:
 
 XSUBPPDIR = C:\Perl\lib\ExtUtils
-XSUBPP = $(XSUBPPDIR)/xsubpp
+XSUBPP = $(XSUBPPDIR)$(DFSEP)xsubpp
+XSUBPPRUN = $(PERLRUN) $(XSUBPP)
 XSPROTOARG = 
-XSUBPPDEPS = $(XSUBPPDIR)\typemap typemap $(XSUBPP)
-XSUBPPARGS = -typemap $(XSUBPPDIR)\typemap -typemap typemap
+XSUBPPDEPS = C:\Perl\lib\ExtUtils\typemap typemap $(XSUBPP)
+XSUBPPARGS = -typemap C:\Perl\lib\ExtUtils\typemap -typemap typemap
+XSUBPP_EXTRA_ARGS = 
 
 
 # --- MakeMaker tools_other section:
-
-SHELL = cmd /x /c
-CHMOD = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e chmod
-CP = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e cp
-LD = link
-MV = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e mv
+CHMOD = $(ABSPERLRUN) -MExtUtils::Command -e chmod
+CP = $(ABSPERLRUN) -MExtUtils::Command -e cp
+MV = $(ABSPERLRUN) -MExtUtils::Command -e mv
 NOOP = rem
-RM_F = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f
-RM_RF = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_rf
-TEST_F = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e test_f
-TOUCH = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e touch
+NOECHO = @
+RM_F = $(ABSPERLRUN) -MExtUtils::Command -e rm_f
+RM_RF = $(ABSPERLRUN) -MExtUtils::Command -e rm_rf
+TEST_F = $(ABSPERLRUN) -MExtUtils::Command -e test_f
+TOUCH = $(ABSPERLRUN) -MExtUtils::Command -e touch
 UMASK_NULL = umask 0
 DEV_NULL = > NUL
+MKPATH = $(ABSPERLRUN) "-MExtUtils::Command" -e mkpath
+EQUALIZE_TIMESTAMP = $(ABSPERLRUN) "-MExtUtils::Command" -e eqtime
+ECHO = $(ABSPERLRUN) -l -e "print qq{@ARGV}" --
+ECHO_N = $(ABSPERLRUN)  -e "print qq{@ARGV}" --
+UNINST = 0
+VERBINST = 0
+MOD_INSTALL = $(ABSPERLRUN) -MExtUtils::Install -e "install({@ARGV}, '$(VERBINST)', 0, '$(UNINST)');" --
+DOC_INSTALL = $(ABSPERLRUN) "-MExtUtils::Command::MM" -e perllocal_install
+UNINSTALL = $(ABSPERLRUN) "-MExtUtils::Command::MM" -e uninstall
+WARN_IF_OLD_PACKLIST = $(ABSPERLRUN) "-MExtUtils::Command::MM" -e warn_if_old_packlist
+MACROSTART = 
+MACROEND = 
+USEMAKEFILE = -f
+FIXIN = pl2bat.bat
 
-# The following is a portable way to say mkdir -p
-# To see which directories are created, change the if 0 to if 1
-MKPATH = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e mkpath
-
-# This helps us to minimize the effect of the .exists files A yet
-# better solution would be to have a stable file in the perl
-# distribution with a timestamp of zero. But this solution doesn't
-# need any changes to the core distribution and works with older perls
-EQUALIZE_TIMESTAMP = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e eqtime
-
-# Here we warn users that an old packlist file was found somewhere,
-# and that they should call some uninstall routine
-WARN_IF_OLD_PACKLIST = $(PERL) -lwe "exit unless -f $$ARGV[0];" \
--e "print 'WARNING: I have found an old package in';" \
--e "print '	', $$ARGV[0], '.';" \
--e "print 'Please make sure the two installations are not conflicting';"
-
-UNINST=0
-VERBINST=1
-
-MOD_INSTALL = $(PERL) -I$(INST_LIB) -I$(PERL_LIB) -MExtUtils::Install \
--e "install({ @ARGV },'$(VERBINST)',0,'$(UNINST)');"
-
-DOC_INSTALL = $(PERL) -e "$$\=\"\n\n\";" \
--e "print '=head2 ', scalar(localtime), ': C<', shift, '>', ' L<', $$arg=shift, '|', $$arg, '>';" \
--e "print '=over 4';" \
--e "while (defined($$key = shift) and defined($$val = shift)) { print '=item *';print 'C<', \"$$key: $$val\", '>'; }" \
--e "print '=back';"
-
-UNINSTALL =   $(PERL) -MExtUtils::Install \
--e "uninstall($$ARGV[0],1,1); print \"\nUninstall is deprecated. Please check the";" \
--e "print \" packlist above carefully.\n  There may be errors. Remove the\";" \
--e "print \" appropriate files manually.\n  Sorry for the inconveniences.\n\""
 
+# --- MakeMaker makemakerdflt section:
+makemakerdflt: all
+	$(NOECHO) $(NOOP)
 
-# --- MakeMaker dist section:
 
-DISTVNAME = $(DISTNAME)-$(VERSION)
-TAR  = tar
+# --- MakeMaker dist section:
+TAR = tar
 TARFLAGS = cvf
-ZIP  = zip
+ZIP = zip
 ZIPFLAGS = -r
 COMPRESS = gzip -v9
 SUFFIX = gz
 SHAR = shar
 PREOP = $(MAKE) -f Makefile.old distdir
-POSTOP = @$(NOOP)
-TO_UNIX = @$(NOOP)
+POSTOP = $(NOECHO) $(NOOP)
+TO_UNIX = $(NOECHO) $(NOOP)
 CI = ci -u
 RCS_LABEL = rcs -Nv$(VERSION_SYM): -q
 DIST_CP = best
 DIST_DEFAULT = clean distcheck disttest tardist
+DISTNAME = DBD-Oracle8
+DISTVNAME = DBD-Oracle8-1.00
 
 
 # --- MakeMaker macro section:
@@ -283,24 +312,24 @@
 
 # --- MakeMaker cflags section:
 
-CCFLAGS = -nologo -O1 -MD -Zi -DNDEBUG -DWIN32 -D_CONSOLE -DNO_STRICT -DHAVE_DES_FCRYPT -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -DPERL_MSVCRT_READFIX
-OPTIMIZE = -O1 -MD -Zi -DNDEBUG
+CCFLAGS = -nologo -GF -W3 -MD -Zi -DNDEBUG -O1 -DWIN32 -D_CONSOLE -DNO_STRICT -DHAVE_DES_FCRYPT -DNO_HASH_SEED -DUSE_SITECUSTOMIZE -DPRIVLIB_LAST_IN_INC -DPERL_IMPLICIT_CONTEXT -DPERL_IMPLICIT_SYS -DUSE_PERLIO -DPERL_MSVCRT_READFIX
+OPTIMIZE = -MD -Zi -DNDEBUG -O1
 PERLTYPE = 
-MPOLLUTE = 
 
 
 # --- MakeMaker const_loadlibs section:
 
-# DBD::Oracle might depend on some other libraries:
+# DBD::Oracle8 might depend on some other libraries:
 # See ExtUtils::Liblist for details
 #
-EXTRALIBS = c:\instant10.1\sdk\LIB\MSVC\OCI.lib "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\oldnames.lib" "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\kernel32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\user32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\gdi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\winspool.lib" "C:\Program Files\Microsoft Platform SDK\Lib\comdlg32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\advapi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\shell32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\ole32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\oleaut32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\netapi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\uuid.lib" "C:\Program Files\Microsoft Platform SDK\Lib\wsock32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\mpr.lib" "C:\Program Files\Microsoft Platform SDK\Lib\winmm.lib" "C:\Program Files\Microsoft Platform SDK\Lib\ver
 sion.lib" "C:\Program Files\Microsoft Platform SDK\Lib\odbc32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\odbccp32.lib" "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\msvcrt.lib" -L$(LIBHOME)
-LDLOADLIBS = c:\instant10.1\sdk\LIB\MSVC\OCI.lib "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\oldnames.lib" "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\kernel32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\user32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\gdi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\winspool.lib" "C:\Program Files\Microsoft Platform SDK\Lib\comdlg32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\advapi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\shell32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\ole32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\oleaut32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\netapi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\uuid.lib" "C:\Program Files\Microsoft Platform SDK\Lib\wsock32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\mpr.lib" "C:\Program Files\Microsoft Platform SDK\Lib\winmm.lib" "C:\Program Files\Microsoft Platform SDK\Lib\ve
 rsion.lib" "C:\Program Files\Microsoft Platform SDK\Lib\odbc32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\odbccp32.lib" "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\msvcrt.lib"
+EXTRALIBS = D:\oracle\ora81\oci\LIB\MSVC\OCI.lib "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\oldnames.lib" "C:\Program Files\Microsoft Platform SDK\Lib\kernel32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\user32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\gdi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\winspool.lib" "C:\Program Files\Microsoft Platform SDK\Lib\comdlg32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\advapi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\shell32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\ole32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\oleaut32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\netapi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\uuid.lib" "C:\Program Files\Microsoft Platform SDK\Lib\ws2_32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\mpr.lib" "C:\Program Files\Microsoft Platform SDK\Lib\winmm.lib" "C:\Program Files\Microsoft Platform SDK\Lib\version.lib" "C:\P
 rogram Files\Microsoft Platform SDK\Lib\odbc32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\odbccp32.lib" "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\msvcrt.lib" -L$(LIBHOME)
+LDLOADLIBS = D:\oracle\ora81\oci\LIB\MSVC\OCI.lib "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\oldnames.lib" "C:\Program Files\Microsoft Platform SDK\Lib\kernel32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\user32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\gdi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\winspool.lib" "C:\Program Files\Microsoft Platform SDK\Lib\comdlg32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\advapi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\shell32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\ole32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\oleaut32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\netapi32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\uuid.lib" "C:\Program Files\Microsoft Platform SDK\Lib\ws2_32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\mpr.lib" "C:\Program Files\Microsoft Platform SDK\Lib\winmm.lib" "C:\Program Files\Microsoft Platform SDK\Lib\version.lib" "C:\
 Program Files\Microsoft Platform SDK\Lib\odbc32.lib" "C:\Program Files\Microsoft Platform SDK\Lib\odbccp32.lib" "C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\lib\msvcrt.lib"
 BSLOADLIBS = 
-LD_RUN_PATH=c:/instant10.1/lib:c:/instant10.1/rdbms/lib
+
 
 # --- MakeMaker const_cccmd section:
-CCCMD = $(CC) -c $(INC) $(CCFLAGS) $(OPTIMIZE) \
+CCCMD = $(CC) -c $(PASTHRU_INC) $(INC) \
+	$(CCFLAGS) $(OPTIMIZE) \
 	$(PERLTYPE) $(MPOLLUTE) $(DEFINE_VERSION) \
 	$(XS_DEFINE_VERSION)
 
@@ -310,122 +339,153 @@
 # --- MakeMaker pasthru section:
 PASTHRU = -nologo
 
+# --- MakeMaker special_targets section:
+.SUFFIXES : .xs .c .C .cpp .i .s .cxx .cc $(OBJ_EXT)
+
+.PHONY: all config static dynamic test linkext manifest blibdirs clean realclean disttest distdir
+
+
+
 # --- MakeMaker c_o section:
 
+.c.i:
+	cl -nologo -E -c $(PASTHRU_INC) $(INC) \
+	$(CCFLAGS) $(OPTIMIZE) \
+	$(PERLTYPE) $(MPOLLUTE) $(DEFINE_VERSION) \
+	$(XS_DEFINE_VERSION) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.c > $*.i
+
+.c.s:
+	$(CCCMD) -S $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.c
+
 .c$(OBJ_EXT):
-	$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) $*.c
+	$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.c
 
 .cpp$(OBJ_EXT):
-	$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) $*.cpp
+	$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.cpp
 
 .cxx$(OBJ_EXT):
-	$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) $*.cxx
+	$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.cxx
 
 .cc$(OBJ_EXT):
-	$(CCCMD) $(CCCDLFLAGS) -I$(PERL_INC) $(DEFINE) $*.cc
+	$(CCCMD) $(CCCDLFLAGS) "-I$(PERL_INC)" $(PASTHRU_DEFINE) $(DEFINE) $*.cc
 
 
 # --- MakeMaker xs_c section:
 
 .xs.c:
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(XSUBPP) $(XSPROTOARG) $(XSUBPPARGS) $*.xs > $*.xsc && $(MV) $*.xsc $*.c
+	$(XSUBPPRUN) $(XSPROTOARG) $(XSUBPPARGS) $(XSUBPP_EXTRA_ARGS) $*.xs > $*.xsc && $(MV) $*.xsc $*.c
 
 
 # --- MakeMaker xs_o section:
 
 
 # --- MakeMaker top_targets section:
+all :: pure_all htmlifypods
+	$(NOECHO) $(NOOP)
 
-#all ::	config $(INST_PM) subdirs linkext manifypods
-
-all :: pure_all htmlifypods manifypods
-	@$(NOOP)
 
 pure_all :: config pm_to_blib subdirs linkext
-	@$(NOOP)
+	$(NOECHO) $(NOOP)
 
 subdirs :: $(MYEXTLIB)
-	@$(NOOP)
-
-config :: Makefile $(INST_LIBDIR)\.exists
-	@$(NOOP)
-
-config :: $(INST_ARCHAUTODIR)\.exists
-	@$(NOOP)
-
-config :: $(INST_AUTODIR)\.exists
-	@$(NOOP)
-
-$(INST_AUTODIR)\.exists :: C:\Perl\lib\CORE\perl.h
-	@$(MKPATH) $(INST_AUTODIR)
-	@$(EQUALIZE_TIMESTAMP) C:\Perl\lib\CORE\perl.h $(INST_AUTODIR)\.exists
-
-	-@$(CHMOD) $(PERM_RWX) $(INST_AUTODIR)
-
-$(INST_LIBDIR)\.exists :: C:\Perl\lib\CORE\perl.h
-	@$(MKPATH) $(INST_LIBDIR)
-	@$(EQUALIZE_TIMESTAMP) C:\Perl\lib\CORE\perl.h $(INST_LIBDIR)\.exists
+	$(NOECHO) $(NOOP)
 
-	-@$(CHMOD) $(PERM_RWX) $(INST_LIBDIR)
-
-$(INST_ARCHAUTODIR)\.exists :: C:\Perl\lib\CORE\perl.h
-	@$(MKPATH) $(INST_ARCHAUTODIR)
-	@$(EQUALIZE_TIMESTAMP) C:\Perl\lib\CORE\perl.h $(INST_ARCHAUTODIR)\.exists
-
-	-@$(CHMOD) $(PERM_RWX) $(INST_ARCHAUTODIR)
+config :: $(FIRST_MAKEFILE) blibdirs
+	$(NOECHO) $(NOOP)
 
 $(O_FILES): $(H_FILES)
 
-help:
+help :
 	perldoc ExtUtils::MakeMaker
 
-Version_check:
-	@$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) \
-		-MExtUtils::MakeMaker=Version_check \
-		-e "Version_check('$(MM_VERSION)')"
+
+# --- MakeMaker blibdirs section:
+blibdirs : $(INST_LIBDIR)$(DFSEP).exists $(INST_ARCHLIB)$(DFSEP).exists $(INST_AUTODIR)$(DFSEP).exists $(INST_ARCHAUTODIR)$(DFSEP).exists $(INST_BIN)$(DFSEP).exists $(INST_SCRIPT)$(DFSEP).exists $(INST_MAN1DIR)$(DFSEP).exists $(INST_MAN3DIR)$(DFSEP).exists
+	$(NOECHO) $(NOOP)
+
+# Backwards compat with 6.18 through 6.25
+blibdirs.ts : blibdirs
+	$(NOECHO) $(NOOP)
+
+$(INST_LIBDIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_LIBDIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_LIBDIR)
+	$(NOECHO) $(TOUCH) $(INST_LIBDIR)$(DFSEP).exists
+
+$(INST_ARCHLIB)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_ARCHLIB)
+	$(NOECHO) $(CHMOD) 755 $(INST_ARCHLIB)
+	$(NOECHO) $(TOUCH) $(INST_ARCHLIB)$(DFSEP).exists
+
+$(INST_AUTODIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_AUTODIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_AUTODIR)
+	$(NOECHO) $(TOUCH) $(INST_AUTODIR)$(DFSEP).exists
+
+$(INST_ARCHAUTODIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_ARCHAUTODIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_ARCHAUTODIR)
+	$(NOECHO) $(TOUCH) $(INST_ARCHAUTODIR)$(DFSEP).exists
+
+$(INST_BIN)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_BIN)
+	$(NOECHO) $(CHMOD) 755 $(INST_BIN)
+	$(NOECHO) $(TOUCH) $(INST_BIN)$(DFSEP).exists
+
+$(INST_SCRIPT)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_SCRIPT)
+	$(NOECHO) $(CHMOD) 755 $(INST_SCRIPT)
+	$(NOECHO) $(TOUCH) $(INST_SCRIPT)$(DFSEP).exists
+
+$(INST_MAN1DIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_MAN1DIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_MAN1DIR)
+	$(NOECHO) $(TOUCH) $(INST_MAN1DIR)$(DFSEP).exists
+
+$(INST_MAN3DIR)$(DFSEP).exists :: Makefile.PL
+	$(NOECHO) $(MKPATH) $(INST_MAN3DIR)
+	$(NOECHO) $(CHMOD) 755 $(INST_MAN3DIR)
+	$(NOECHO) $(TOUCH) $(INST_MAN3DIR)$(DFSEP).exists
+
 
 
 # --- MakeMaker linkext section:
 
 linkext :: $(LINKTYPE)
-	@$(NOOP)
+	$(NOECHO) $(NOOP)
 
 
 # --- MakeMaker dlsyms section:
 
-Oracle.def: Makefile.PL
-	$(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" -MExtUtils::Mksymlists \
-     -e "Mksymlists('NAME' => 'DBD::Oracle', 'DLBASE' => '$(BASEEXT)', 'DL_FUNCS' => {  }, 'FUNCLIST' => [], 'IMPORTS' => {  }, 'DL_VARS' => []);"
+Oracle8.def: Makefile.PL
+	$(PERLRUN) -MExtUtils::Mksymlists \
+     -e "Mksymlists('NAME'=>\"DBD::Oracle8\", 'DLBASE' => '$(BASEEXT)', 'DL_FUNCS' => {  }, 'FUNCLIST' => [], 'IMPORTS' => {  }, 'DL_VARS' => []);"
 
 
 # --- MakeMaker dynamic section:
 
-## $(INST_PM) has been moved to the all: target.
-## It remains here for awhile to allow for old usage: "make dynamic"
-#dynamic :: Makefile $(INST_DYNAMIC) $(INST_BOOT) $(INST_PM)
-dynamic :: Makefile $(INST_DYNAMIC) $(INST_BOOT)
-	@$(NOOP)
+dynamic :: $(FIRST_MAKEFILE) $(INST_DYNAMIC) $(INST_BOOT)
+	$(NOECHO) $(NOOP)
 
 
 # --- MakeMaker dynamic_bs section:
-
-BOOTSTRAP = Oracle.bs
+BOOTSTRAP = $(BASEEXT).bs
 
 # As Mkbootstrap might not write a file (if none is required)
 # we use touch to prevent make continually trying to remake it.
 # The DynaLoader only reads a non-empty file.
-$(BOOTSTRAP): Makefile  $(INST_ARCHAUTODIR)\.exists
-	@echo "Running Mkbootstrap for $(NAME) ($(BSLOADLIBS))"
-	@$(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" \
-		-MExtUtils::Mkbootstrap \
+$(BOOTSTRAP) : $(FIRST_MAKEFILE) $(BOOTDEP) $(INST_ARCHAUTODIR)$(DFSEP).exists
+	$(NOECHO) $(ECHO) "Running Mkbootstrap for $(NAME) ($(BSLOADLIBS))"
+	$(NOECHO) $(PERLRUN) \
+		"-MExtUtils::Mkbootstrap" \
 		-e "Mkbootstrap('$(BASEEXT)','$(BSLOADLIBS)');"
-	@$(TOUCH) $(BOOTSTRAP)
-	$(CHMOD) 644 $@
+	$(NOECHO) $(TOUCH) $@
+	$(CHMOD) $(PERM_RW) $@
 
-$(INST_BOOT): $(BOOTSTRAP) $(INST_ARCHAUTODIR)\.exists
-	@$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_rf $(INST_BOOT)
-	-$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e cp $(BOOTSTRAP) $(INST_BOOT)
-	$(CHMOD) 644 $@
+$(INST_BOOT) : $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP).exists
+	$(NOECHO) $(RM_RF) $@
+	- $(CP) $(BOOTSTRAP) $@
+	$(CHMOD) $(PERM_RW) $@
 
 
 # --- MakeMaker dynamic_lib section:
@@ -435,133 +495,198 @@
 OTHERLDFLAGS = 
 INST_DYNAMIC_DEP = 
 
-$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)\.exists $(EXPORT_LIST) $(PERL_ARCHIVE) $(INST_DYNAMIC_DEP)
+$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) $(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPORT_LIST) $(PERL_ARCHIVE) $(INST_DYNAMIC_DEP)
 	$(LD) -out:$@ $(LDDLFLAGS) $(LDFROM) $(OTHERLDFLAGS) $(MYEXTLIB) $(PERL_ARCHIVE) $(LDLOADLIBS) -def:$(EXPORT_LIST)
-	$(CHMOD) 755 $@
+	$(CHMOD) $(PERM_RWX) $@
 
 
 # --- MakeMaker static section:
 
 ## $(INST_PM) has been moved to the all: target.
 ## It remains here for awhile to allow for old usage: "make static"
-#static :: Makefile $(INST_STATIC) $(INST_PM)
-static :: Makefile $(INST_STATIC)
-	@$(NOOP)
+static :: $(FIRST_MAKEFILE) $(INST_STATIC)
+	$(NOECHO) $(NOOP)
 
 
 # --- MakeMaker static_lib section:
-
-$(INST_STATIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)\.exists
+$(INST_STATIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists
 	$(RM_RF) $@
 	$(AR) -out:$@ $(OBJECT)
-	@echo "$(EXTRALIBS)" > $(INST_ARCHAUTODIR)\extralibs.ld
-	$(CHMOD) 755 $@
+	$(CHMOD) $(PERM_RWX) $@
+	$(NOECHO) $(ECHO) "$(EXTRALIBS)" > $(INST_ARCHAUTODIR)\extralibs.ld
+
+
+# --- MakeMaker manifypods section:
+
+POD2MAN_EXE = $(PERLRUN) "-MExtUtils::Command::MM" -e pod2man "--"
+POD2MAN = $(POD2MAN_EXE)
+
+
+manifypods : pure_all  \
+	ora_explain \
+	Oracle8.pm \
+	Oraperl.pm
+	$(NOECHO) $(POD2MAN) --section=1 --perm_rw=$(PERM_RW) \
+	  ora_explain $(INST_MAN1DIR)\ora_explain.$(MAN1EXT) 
+	$(NOECHO) $(POD2MAN) --section=3 --perm_rw=$(PERM_RW) \
+	  Oracle8.pm $(INST_MAN3DIR)\DBD\Oracle8.$(MAN3EXT) \
+	  Oraperl.pm $(INST_MAN3DIR)\DBD\Oraperl.$(MAN3EXT) 
+
+
 
 
 # --- MakeMaker htmlifypods section:
 
-htmlifypods : pure_all
-	@$(NOOP)
+POD2HTML_EXE = $(PERLRUN) "-MActivePerl::DocTools" -e "UpdateHTML_blib(installdirs => "$(INSTALLDIRS)")"
+POD2HTML = $(POD2HTML_EXE)
 
 
-# --- MakeMaker manifypods section:
+htmlifypods :  \
+	ora_explain \
+	Oracle8.pm \
+	Oraperl.pm
+	$(NOECHO) $(POD2HTML)
 
-manifypods :
-	@$(NOOP)
 
 
 # --- MakeMaker processPL section:
 
 all :: ora_explain
-	@$(NOOP)
+	$(NOECHO) $(NOOP)
 
-ora_explain :: ora_explain.PL
-	$(PERL) -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) ora_explain.PL ora_explain
+ora_explain :: ora_explain.PL pm_to_blib
+	$(PERLRUNINST) ora_explain.PL ora_explain
 
 
 # --- MakeMaker installbin section:
 
-$(INST_SCRIPT)\.exists :: C:\Perl\lib\CORE\perl.h
-	@$(MKPATH) $(INST_SCRIPT)
-	@$(EQUALIZE_TIMESTAMP) C:\Perl\lib\CORE\perl.h $(INST_SCRIPT)\.exists
-
-	-@$(CHMOD) $(PERM_RWX) $(INST_SCRIPT)
-
 EXE_FILES = ora_explain
 
-FIXIN = $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) \
-    -e "system qq[pl2bat.bat ].shift"
-
 pure_all :: $(INST_SCRIPT)\ora_explain
-	@$(NOOP)
+	$(NOECHO) $(NOOP)
 
 realclean ::
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f $(INST_SCRIPT)\ora_explain
+	$(RM_F) \
+	  $(INST_SCRIPT)\ora_explain 
 
-$(INST_SCRIPT)\ora_explain: ora_explain Makefile $(INST_SCRIPT)\.exists
-	@$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f $(INST_SCRIPT)\ora_explain
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e cp ora_explain $(INST_SCRIPT)\ora_explain
+$(INST_SCRIPT)\ora_explain : ora_explain $(FIRST_MAKEFILE) $(INST_SCRIPT)$(DFSEP).exists $(INST_BIN)$(DFSEP).exists
+	$(NOECHO) $(RM_F) $(INST_SCRIPT)\ora_explain
+	$(CP) ora_explain $(INST_SCRIPT)\ora_explain
 	$(FIXIN) $(INST_SCRIPT)\ora_explain
-	-@$(CHMOD) $(PERM_RWX) $(INST_SCRIPT)\ora_explain
+	-$(NOECHO) $(CHMOD) $(PERM_RWX) $(INST_SCRIPT)\ora_explain
+
 
 
 # --- MakeMaker subdirs section:
 
 # none
 
+# --- MakeMaker clean_subdirs section:
+clean_subdirs :
+	$(NOECHO) $(NOOP)
+
+
 # --- MakeMaker clean section:
 
 # Delete temporary files but do not touch installed files. We don't delete
 # the Makefile here so a later make realclean still has a makefile to use.
 
-clean ::
-	-$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_rf Oracle.c xstmp.c Oracle.xsi dll.base dll.exp sqlnet.log libOracle.def ora_explain mk.pm DBD_ORA_OBJ.* ./blib $(MAKE_APERL_FILE) $(INST_ARCHAUTODIR)/extralibs.all perlmain.c mon.out core core.*perl.*.? *perl.core so_locations pm_to_blib *$(OBJ_EXT) *$(LIB_EXT) perl.exe $(BOOTSTRAP) $(BASEEXT).bso $(BASEEXT).def $(BASEEXT).exp
-	-$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e mv Makefile Makefile.old $(DEV_NULL)
+clean :: clean_subdirs
+	- $(RM_F) \
+	  *$(LIB_EXT) core \
+	  core.[0-9] core.[0-9][0-9] \
+	  $(BASEEXT).bso $(INST_ARCHAUTODIR)\extralibs.ld \
+	  pm_to_blib.ts core.[0-9][0-9][0-9][0-9] \
+	  $(BASEEXT).x $(BOOTSTRAP) \
+	  perl$(EXE_EXT) tmon.out \
+	  $(INST_ARCHAUTODIR)\extralibs.all *$(OBJ_EXT) \
+	  pm_to_blib blibdirs.ts \
+	  Oracle.c core.[0-9][0-9][0-9][0-9][0-9] \
+	  *perl.core core.*perl.*.? \
+	  $(MAKE_APERL_FILE) perl \
+	  $(BASEEXT).def core.[0-9][0-9][0-9] \
+	  mon.out lib$(BASEEXT).def \
+	  perlmain.c perl.exe \
+	  so_locations $(BASEEXT).exp 
+	- $(RM_RF) \
+	  *.pdb ora_explain \
+	  dll.base DBD_ORA_OBJ.* \
+	  Oracle.xsi dll.exp \
+	  libOracle.def sqlnet.log \
+	  blib mk.pm \
+	  xstmp.c 
+	- $(MV) $(FIRST_MAKEFILE) $(MAKEFILE_OLD) $(DEV_NULL)
+
+
+# --- MakeMaker realclean_subdirs section:
+realclean_subdirs :
+	$(NOECHO) $(NOOP)
 
 
 # --- MakeMaker realclean section:
-
-# Delete temporary files (via clean) and also delete installed files
-realclean purge ::  clean
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_rf $(INST_AUTODIR) $(INST_ARCHAUTODIR)
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f $(INST_DYNAMIC) $(INST_BOOT)
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f $(INST_STATIC)
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f  $(INST_LIB)\DBD\Oracle\GetInfo.pm $(INST_LIBDIR)\Oracle.pm
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f $(INST_ARCHAUTODIR)/dbdimp.h $(INST_ARCHAUTODIR)/mk.pm
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f $(INST_ARCHAUTODIR)/ocitrace.h $(INST_ARCHAUTODIR)/Oracle.h
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f $(INST_LIB)/oraperl.ph $(INST_LIB)/Oraperl.pm
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_rf Makefile Makefile.old
+# Delete temporary files (via clean) and also delete dist files
+realclean purge ::  clean realclean_subdirs
+	- $(RM_F) \
+	  $(OBJECT) $(MAKEFILE_OLD) \
+	  $(FIRST_MAKEFILE) 
+	- $(RM_RF) \
+	  $(DISTVNAME) 
+
+
+# --- MakeMaker metafile section:
+metafile : create_distdir
+	$(NOECHO) $(ECHO) Generating META.yml
+	$(NOECHO) $(ECHO) "--- #YAML:1.0" > META_new.yml
+	$(NOECHO) $(ECHO) "name:                DBD-Oracle8" >> META_new.yml
+	$(NOECHO) $(ECHO) "version:             1.00" >> META_new.yml
+	$(NOECHO) $(ECHO) "abstract:            Oracle database driver for the DBI module" >> META_new.yml
+	$(NOECHO) $(ECHO) "license:             ~" >> META_new.yml
+	$(NOECHO) $(ECHO) "generated_by:        ExtUtils::MakeMaker version 6.3201" >> META_new.yml
+	$(NOECHO) $(ECHO) "distribution_type:   module" >> META_new.yml
+	$(NOECHO) $(ECHO) "requires:     " >> META_new.yml
+	$(NOECHO) $(ECHO) "    DBI:                           0" >> META_new.yml
+	$(NOECHO) $(ECHO) "meta-spec:" >> META_new.yml
+	$(NOECHO) $(ECHO) "    url:     http://module-build.sourceforge.net/META-spec-v1.2.html" >> META_new.yml
+	$(NOECHO) $(ECHO) "    version: 1.2" >> META_new.yml
+	$(NOECHO) $(ECHO) "author:" >> META_new.yml
+	$(NOECHO) $(ECHO) "    - Tim Bunce ([email protected])" >> META_new.yml
+	-$(NOECHO) $(MV) META_new.yml $(DISTVNAME)/META.yml
+
+
+# --- MakeMaker signature section:
+signature :
+	cpansign -s
 
 
 # --- MakeMaker dist_basics section:
-
 distclean :: realclean distcheck
+	$(NOECHO) $(NOOP)
 
 distcheck :
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=fullcheck \
-		-e fullcheck
+	$(PERLRUN) "-MExtUtils::Manifest=fullcheck" -e fullcheck
 
 skipcheck :
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=skipcheck \
-		-e skipcheck
+	$(PERLRUN) "-MExtUtils::Manifest=skipcheck" -e skipcheck
 
 manifest :
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=mkmanifest \
-		-e mkmanifest
+	$(PERLRUN) "-MExtUtils::Manifest=mkmanifest" -e mkmanifest
 
 veryclean : realclean
 	$(RM_F) *~ *.orig */*~ */*.orig
 
 
+
 # --- MakeMaker dist_core section:
 
-dist : $(DIST_DEFAULT)
-	@$(PERL) -le "print \"Warning: Makefile possibly out of date with $$vf\" if " \
-	    -e "-e ($$vf=\"$(VERSION_FROM)\") and -M $$vf < -M \"Makefile\";"
+dist : $(DIST_DEFAULT) $(FIRST_MAKEFILE)
+	$(NOECHO) $(ABSPERLRUN) -l -e "print 'Warning: Makefile possibly out of date with $(VERSION_FROM)'\
+    if -e '$(VERSION_FROM)' and -M '$(VERSION_FROM)' < -M '$(FIRST_MAKEFILE)';" --
 
 tardist : $(DISTVNAME).tar$(SUFFIX)
+	$(NOECHO) $(NOOP)
 
-zipdist : $(DISTVNAME).zip
+uutardist : $(DISTVNAME).tar$(SUFFIX)
+	uuencode $(DISTVNAME).tar$(SUFFIX) $(DISTVNAME).tar$(SUFFIX) > $(DISTVNAME).tar$(SUFFIX)_uu
 
 $(DISTVNAME).tar$(SUFFIX) : distdir
 	$(PREOP)
@@ -571,17 +696,15 @@
 	$(COMPRESS) $(DISTVNAME).tar
 	$(POSTOP)
 
+zipdist : $(DISTVNAME).zip
+	$(NOECHO) $(NOOP)
+
 $(DISTVNAME).zip : distdir
 	$(PREOP)
 	$(ZIP) $(ZIPFLAGS) $(DISTVNAME).zip $(DISTVNAME)
 	$(RM_RF) $(DISTVNAME)
 	$(POSTOP)
 
-uutardist : $(DISTVNAME).tar$(SUFFIX)
-	uuencode $(DISTVNAME).tar$(SUFFIX) \
-		$(DISTVNAME).tar$(SUFFIX) > \
-		$(DISTVNAME).tar$(SUFFIX)_uu
-
 shdist : distdir
 	$(PREOP)
 	$(SHAR) $(DISTVNAME) > $(DISTVNAME).shar
@@ -589,118 +712,181 @@
 	$(POSTOP)
 
 
-# --- MakeMaker dist_dir section:
-
-distdir :
+# --- MakeMaker distdir section:
+create_distdir :
 	$(RM_RF) $(DISTVNAME)
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=manicopy,maniread \
+	$(PERLRUN) "-MExtUtils::Manifest=manicopy,maniread" \
 		-e "manicopy(maniread(),'$(DISTVNAME)', '$(DIST_CP)');"
 
+distdir : create_distdir distmeta 
+	$(NOECHO) $(NOOP)
+
 
-# --- MakeMaker dist_test section:
 
+# --- MakeMaker dist_test section:
 disttest : distdir
-	cd $(DISTVNAME) && $(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) Makefile.PL
-	cd $(DISTVNAME) && $(MAKE)
-	cd $(DISTVNAME) && $(MAKE) test
+	cd $(DISTVNAME)
+	$(ABSPERLRUN) Makefile.PL 
+	$(MAKE) $(PASTHRU)
+	$(MAKE) test $(PASTHRU)
+	cd ..
+
 
 
 # --- MakeMaker dist_ci section:
 
 ci :
-	$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Manifest=maniread \
-		-e "@all = keys %{ maniread() };" \
-		-e "print(\"Executing $(CI) @all\n\"); system(\"$(CI) @all\");" \
-		-e "print(\"Executing $(RCS_LABEL) ...\n\"); system(\"$(RCS_LABEL) @all\");"
+	$(PERLRUN) "-MExtUtils::Manifest=maniread" \
+	  -e "@all = keys %{ maniread() };" \
+	  -e "print(qq{Executing $(CI) @all\n}); system(qq{$(CI) @all});" \
+	  -e "print(qq{Executing $(RCS_LABEL) ...\n}); system(qq{$(RCS_LABEL) @all});"
+
+
+# --- MakeMaker distmeta section:
+distmeta : create_distdir metafile
+	$(NOECHO) cd $(DISTVNAME)
+	$(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e "eval { maniadd({q{META.yml} => q{Module meta-data (added by MakeMaker)}}) } \
+    or print \"Could not add META.yml to MANIFEST: $${'@'}\n\"" --
+	cd ..
+
+
+
+# --- MakeMaker distsignature section:
+distsignature : create_distdir
+	$(NOECHO) cd $(DISTVNAME)
+	$(ABSPERLRUN) -MExtUtils::Manifest=maniadd -e "eval { maniadd({q{SIGNATURE} => q{Public-key signature (added by MakeMaker)}}) } \
+    or print \"Could not add SIGNATURE to MANIFEST: $${'@'}\n\"" --
+	cd ..
+	$(NOECHO) cd $(DISTVNAME)
+	$(TOUCH) SIGNATURE
+	cd ..
+	cd $(DISTVNAME)
+	cpansign -s
+	cd ..
+
 
 
 # --- MakeMaker install section:
 
-install :: all pure_install doc_install
+install :: all pure_install doc_install doc_update
+	$(NOECHO) $(NOOP)
 
 install_perl :: all pure_perl_install doc_perl_install
+	$(NOECHO) $(NOOP)
 
 install_site :: all pure_site_install doc_site_install
+	$(NOECHO) $(NOOP)
 
-install_ :: install_site
-	@echo INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
+install_vendor :: all pure_vendor_install doc_vendor_install
+	$(NOECHO) $(NOOP)
 
 pure_install :: pure_$(INSTALLDIRS)_install
+	$(NOECHO) $(NOOP)
 
 doc_install :: doc_$(INSTALLDIRS)_install
-	@echo Appending installation info to $(INSTALLARCHLIB)/perllocal.pod
+	$(NOECHO) $(NOOP)
+
+doc_update ::
+	$(NOECHO) $(PERLRUN) "-MActivePerl::DocTools" -e ActivePerl::DocTools::WriteTOC
 
 pure__install : pure_site_install
-	@echo INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
+	$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
 
 doc__install : doc_site_install
-	@echo INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
+	$(NOECHO) $(ECHO) INSTALLDIRS not defined, defaulting to INSTALLDIRS=site
 
 pure_perl_install ::
-	@$(MOD_INSTALL) \
+	$(NOECHO) $(MOD_INSTALL) \
 		read $(PERL_ARCHLIB)\auto\$(FULLEXT)\.packlist \
-		write $(INSTALLARCHLIB)\auto\$(FULLEXT)\.packlist \
-		$(INST_LIB) $(INSTALLPRIVLIB) \
-		$(INST_ARCHLIB) $(INSTALLARCHLIB) \
-		$(INST_BIN) $(INSTALLBIN) \
-		$(INST_SCRIPT) $(INSTALLSCRIPT) \
-		$(INST_HTMLLIBDIR) $(INSTALLHTMLPRIVLIBDIR) \
-		$(INST_HTMLSCRIPTDIR) $(INSTALLHTMLSCRIPTDIR) \
-		$(INST_MAN1DIR) $(INSTALLMAN1DIR) \
-		$(INST_MAN3DIR) $(INSTALLMAN3DIR)
-	@$(WARN_IF_OLD_PACKLIST) \
+		write $(DESTINSTALLARCHLIB)\auto\$(FULLEXT)\.packlist \
+		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
+		$(INST_BIN) $(DESTINSTALLBIN) \
+		$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
+		$(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \
+		$(INST_MAN3DIR) $(DESTINSTALLMAN3DIR) \
+		$(INST_HTMLDIR) $(DESTINSTALLHTMLDIR)
+	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
 		$(SITEARCHEXP)\auto\$(FULLEXT)
 
 
 pure_site_install ::
-	@$(MOD_INSTALL) \
+	$(NOECHO) $(MOD_INSTALL) \
 		read $(SITEARCHEXP)\auto\$(FULLEXT)\.packlist \
-		write $(INSTALLSITEARCH)\auto\$(FULLEXT)\.packlist \
-		$(INST_LIB) $(INSTALLSITELIB) \
-		$(INST_ARCHLIB) $(INSTALLSITEARCH) \
-		$(INST_BIN) $(INSTALLBIN) \
-		$(INST_SCRIPT) $(INSTALLSCRIPT) \
-		$(INST_HTMLLIBDIR) $(INSTALLHTMLSITELIBDIR) \
-		$(INST_HTMLSCRIPTDIR) $(INSTALLHTMLSCRIPTDIR) \
-		$(INST_MAN1DIR) $(INSTALLMAN1DIR) \
-		$(INST_MAN3DIR) $(INSTALLMAN3DIR)
-	@$(WARN_IF_OLD_PACKLIST) \
+		write $(DESTINSTALLSITEARCH)\auto\$(FULLEXT)\.packlist \
+		$(INST_LIB) $(DESTINSTALLSITELIB) \
+		$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
+		$(INST_BIN) $(DESTINSTALLSITEBIN) \
+		$(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \
+		$(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \
+		$(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR) \
+		$(INST_HTMLDIR) $(DESTINSTALLSITEHTMLDIR)
+	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
 		$(PERL_ARCHLIB)\auto\$(FULLEXT)
 
+pure_vendor_install ::
+	$(NOECHO) $(MOD_INSTALL) \
+		read $(VENDORARCHEXP)\auto\$(FULLEXT)\.packlist \
+		write $(DESTINSTALLVENDORARCH)\auto\$(FULLEXT)\.packlist \
+		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
+		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
+		$(INST_SCRIPT) $(DESTINSTALLVENDORSCRIPT) \
+		$(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \
+		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR) \
+		$(INST_HTMLDIR) $(DESTINSTALLVENDORHTMLDIR)
+
 doc_perl_install ::
-	-@$(MKPATH) $(INSTALLARCHLIB)
-	-@$(DOC_INSTALL) \
+	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+	-$(NOECHO) $(DOC_INSTALL) \
 		"Module" "$(NAME)" \
 		"installed into" "$(INSTALLPRIVLIB)" \
 		LINKTYPE "$(LINKTYPE)" \
 		VERSION "$(VERSION)" \
 		EXE_FILES "$(EXE_FILES)" \
-		>> $(INSTALLARCHLIB)\perllocal.pod
+		>> $(DESTINSTALLARCHLIB)\perllocal.pod
 
 doc_site_install ::
-	-@$(MKPATH) $(INSTALLARCHLIB)
-	-@$(DOC_INSTALL) \
+	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+	-$(NOECHO) $(DOC_INSTALL) \
 		"Module" "$(NAME)" \
 		"installed into" "$(INSTALLSITELIB)" \
 		LINKTYPE "$(LINKTYPE)" \
 		VERSION "$(VERSION)" \
 		EXE_FILES "$(EXE_FILES)" \
-		>> $(INSTALLARCHLIB)\perllocal.pod
+		>> $(DESTINSTALLARCHLIB)\perllocal.pod
 
+doc_vendor_install ::
+	$(NOECHO) $(ECHO) Appending installation info to $(DESTINSTALLARCHLIB)/perllocal.pod
+	-$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
+	-$(NOECHO) $(DOC_INSTALL) \
+		"Module" "$(NAME)" \
+		"installed into" "$(INSTALLVENDORLIB)" \
+		LINKTYPE "$(LINKTYPE)" \
+		VERSION "$(VERSION)" \
+		EXE_FILES "$(EXE_FILES)" \
+		>> $(DESTINSTALLARCHLIB)\perllocal.pod
 
-uninstall :: uninstall_from_$(INSTALLDIRS)dirs
+
+uninstall :: uninstall_from_$(INSTALLDIRS)dirs doc_update
+	$(NOECHO) $(NOOP)
 
 uninstall_from_perldirs ::
-	@$(UNINSTALL) $(PERL_ARCHLIB)\auto\$(FULLEXT)\.packlist
+	$(NOECHO) $(UNINSTALL) $(PERL_ARCHLIB)\auto\$(FULLEXT)\.packlist
 
 uninstall_from_sitedirs ::
-	@$(UNINSTALL) $(SITEARCHEXP)\auto\$(FULLEXT)\.packlist
+	$(NOECHO) $(UNINSTALL) $(SITEARCHEXP)\auto\$(FULLEXT)\.packlist
+
+uninstall_from_vendordirs ::
+	$(NOECHO) $(UNINSTALL) $(VENDORARCHEXP)\auto\$(FULLEXT)\.packlist
 
 
 # --- MakeMaker force section:
 # Phony target to force checking subdirectories.
 FORCE:
-	@$(NOOP)
+	$(NOECHO) $(NOOP)
 
 
 # --- MakeMaker perldepend section:
@@ -727,13 +913,10 @@
 	$(PERL_INC)/keywords.h		\
 	$(PERL_INC)/mg.h		\
 	$(PERL_INC)/nostdio.h		\
-	$(PERL_INC)/objXSUB.h		\
 	$(PERL_INC)/op.h		\
 	$(PERL_INC)/opcode.h		\
-	$(PERL_INC)/opnames.h		\
 	$(PERL_INC)/patchlevel.h	\
 	$(PERL_INC)/perl.h		\
-	$(PERL_INC)/perlapi.h		\
 	$(PERL_INC)/perlio.h		\
 	$(PERL_INC)/perlsdio.h		\
 	$(PERL_INC)/perlsfio.h		\
@@ -750,9 +933,7 @@
 	$(PERL_INC)/thrdvar.h		\
 	$(PERL_INC)/thread.h		\
 	$(PERL_INC)/unixish.h		\
-	$(PERL_INC)/utf8.h		\
-	$(PERL_INC)/util.h		\
-	$(PERL_INC)/warnings.h
+	$(PERL_INC)/util.h
 
 $(OBJECT) : $(PERL_HDRS)
 
@@ -763,23 +944,19 @@
 
 $(OBJECT) : $(FIRST_MAKEFILE)
 
-# We take a very conservative approach here, but it\'s worth it.
+# We take a very conservative approach here, but it's worth it.
 # We move Makefile to Makefile.old here to avoid gnu make looping.
-Makefile : Makefile.PL $(CONFIGDEP)
-	@echo "Makefile out-of-date with respect to $?"
-	@echo "Cleaning current config before rebuilding Makefile..."
-	-@$(RM_F) Makefile.old
-	-@$(MV) Makefile Makefile.old
-	-$(MAKE) -f Makefile.old clean $(DEV_NULL) || $(NOOP)
-	$(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" Makefile.PL 
-	@echo "==> Your Makefile has been rebuilt. <=="
-	@echo "==> Please rerun the make command.  <=="
+$(FIRST_MAKEFILE) : Makefile.PL $(CONFIGDEP)
+	$(NOECHO) $(ECHO) "Makefile out-of-date with respect to $?"
+	$(NOECHO) $(ECHO) "Cleaning current config before rebuilding Makefile..."
+	-$(NOECHO) $(RM_F) $(MAKEFILE_OLD)
+	-$(NOECHO) $(MV)   $(FIRST_MAKEFILE) $(MAKEFILE_OLD)
+	- $(MAKE) $(USEMAKEFILE) $(MAKEFILE_OLD) clean $(DEV_NULL)
+	$(PERLRUN) Makefile.PL 
+	$(NOECHO) $(ECHO) "==> Your Makefile has been rebuilt. <=="
+	$(NOECHO) $(ECHO) "==> Please rerun the $(MAKE) command.  <=="
 	false
 
-# To change behavior to :: would be nice, but would break Tk b9.02
-# so you find such a warning below the dist target.
-#Makefile :: $(VERSION_FROM)
-#	@echo "Warning: Makefile possibly out of date with $(VERSION_FROM)"
 
 
 # --- MakeMaker staticmake section:
@@ -789,11 +966,11 @@
 FULLPERL      = C:\Perl\bin\perl.exe
 
 $(MAP_TARGET) :: static $(MAKE_APERL_FILE)
-	$(MAKE) -f $(MAKE_APERL_FILE) $@
+	$(MAKE) $(USEMAKEFILE) $(MAKE_APERL_FILE) $@
 
-$(MAKE_APERL_FILE) : $(FIRST_MAKEFILE)
-	@echo Writing \"$(MAKE_APERL_FILE)\" for this $(MAP_TARGET)
-	@$(PERL) -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) \
+$(MAKE_APERL_FILE) : $(FIRST_MAKEFILE) pm_to_blib
+	$(NOECHO) $(ECHO) Writing \"$(MAKE_APERL_FILE)\" for this $(MAP_TARGET)
+	$(NOECHO) $(PERLRUNINST) \
 		Makefile.PL DIR= \
 		MAKEFILE=$(MAKE_APERL_FILE) LINKTYPE=static \
 		MAKEAPERL=1 NORECURS=1 CCCDLFLAGS=
@@ -804,7 +981,7 @@
 TEST_VERBOSE=0
 TEST_TYPE=test_$(LINKTYPE)
 TEST_FILE = test.pl
-TEST_FILES = t\01base.t t\10general.t t\15nls.t t\20select.t t\21nchar.t t\22nchar_al32utf8.t t\22nchar_utf8.t t\23wide_db.t t\23wide_db_8bit.t t\23wide_db_al32utf8.t t\24implicit_utf8.t t\25plsql.t t\30long.t t\31lob.t t\40ph_type.t t\50cursor.t t\55nested.t t\60reauth.t t\70meta.t
+TEST_FILES = t/*.t
 TESTDB_SW = -d
 
 testdb :: testdb_$(LINKTYPE)
@@ -812,38 +989,52 @@
 test :: $(TEST_TYPE)
 
 test_dynamic :: pure_all
-	$(FULLPERL) -Mblib -I$(PERL_ARCHLIB) -I$(PERL_LIB) -e "use Test::Harness qw(&runtests $$verbose); $$verbose=$(TEST_VERBOSE); runtests @ARGV;" $(TEST_FILES)
-	$(FULLPERL) -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(TEST_FILE)
+	$(FULLPERLRUN) "-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')" $(TEST_FILES)
+	$(FULLPERLRUN) "-I$(INST_LIB)" "-I$(INST_ARCHLIB)" $(TEST_FILE)
 
 testdb_dynamic :: pure_all
-	$(FULLPERL) $(TESTDB_SW) -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(TEST_FILE)
+	$(FULLPERLRUN) $(TESTDB_SW) "-I$(INST_LIB)" "-I$(INST_ARCHLIB)" $(TEST_FILE)
 
 test_ : test_dynamic
 
 test_static :: pure_all $(MAP_TARGET)
-	./$(MAP_TARGET) -Mblib -I$(PERL_ARCHLIB) -I$(PERL_LIB) -e "use Test::Harness qw(&runtests $$verbose); $$verbose=$(TEST_VERBOSE); runtests @ARGV;" $(TEST_FILES)
-	./$(MAP_TARGET) -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(TEST_FILE)
+	./$(MAP_TARGET) "-MExtUtils::Command::MM" "-e" "test_harness($(TEST_VERBOSE), '$(INST_LIB)', '$(INST_ARCHLIB)')" $(TEST_FILES)
+	./$(MAP_TARGET) "-I$(INST_LIB)" "-I$(INST_ARCHLIB)" $(TEST_FILE)
 
 testdb_static :: pure_all $(MAP_TARGET)
-	./$(MAP_TARGET) $(TESTDB_SW) -I$(INST_ARCHLIB) -I$(INST_LIB) -I$(PERL_ARCHLIB) -I$(PERL_LIB) $(TEST_FILE)
+	./$(MAP_TARGET) $(TESTDB_SW) "-I$(INST_LIB)" "-I$(INST_ARCHLIB)" $(TEST_FILE)
 
 
 
 # --- MakeMaker ppd section:
 # Creates a PPD (Perl Package Description) for a binary distribution.
 ppd:
-	@$(PERL) -e "print qq{<SOFTPKG NAME=\"DBD-Oracle\" VERSION=\"1,17,0,0\">\n}. qq{\t<TITLE>DBD-Oracle</TITLE>\n}. qq{\t<ABSTRACT>Oracle database driver for the DBI module</ABSTRACT>\n}. qq{\t<AUTHOR>Tim Bunce (dbi-users\@perl.org)</AUTHOR>\n}. qq{\t<IMPLEMENTATION>\n}. qq{\t\t<DEPENDENCY NAME=\"DBI\" VERSION=\"0,0,0,0\" />\n}. qq{\t\t<OS NAME=\"$(OSNAME)\" />\n}. qq{\t\t<ARCHITECTURE NAME=\"MSWin32-x86-multi-thread\" />\n}. qq{\t\t<CODEBASE HREF=\"\" />\n}. qq{\t</IMPLEMENTATION>\n}. qq{</SOFTPKG>\n}" > DBD-Oracle.ppd
+	$(NOECHO) $(ECHO) "<SOFTPKG NAME=\"$(DISTNAME)\" VERSION=\"1,00,0,0\">" > $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "    <TITLE>$(DISTNAME)</TITLE>" >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "    <ABSTRACT>Oracle database driver for the DBI module</ABSTRACT>" >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "    <AUTHOR>Tim Bunce ([email protected])</AUTHOR>" >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "    <IMPLEMENTATION>" >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "        <DEPENDENCY NAME=\"DBI\" VERSION=\"0,0,0,0\" />" >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "        <OS NAME=\"$(OSNAME)\" />" >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "        <ARCHITECTURE NAME=\"MSWin32-x86-multi-thread-5.8\" />" >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "        <CODEBASE HREF=\"\" />" >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "    </IMPLEMENTATION>" >> $(DISTNAME).ppd
+	$(NOECHO) $(ECHO) "</SOFTPKG>" >> $(DISTNAME).ppd
+
 
 # --- MakeMaker pm_to_blib section:
 
-pm_to_blib: $(TO_INST_PM)
-	@$(PERL) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)" \
-	"-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" -MExtUtils::Install \
-        -e "pm_to_blib(qw[ <<pmfiles.dat ],'$(INST_LIB)\auto','$(PM_FILTER)')"
-	
-$(PM_TO_BLIB)
-<<
-	@$(TOUCH) $@
+pm_to_blib : $(TO_INST_PM)
+	$(NOECHO) $(ABSPERLRUN) -MExtUtils::Install -e "pm_to_blib({@ARGV}, '$(INST_LIB)\auto', '$(PM_FILTER)')" -- \
+	  Oracle.h $(INST_ARCHAUTODIR)/Oracle.h \
+	  Oracle8.pm $(INST_LIB)\DBD\Oracle8.pm \
+	  dbdimp.h $(INST_ARCHAUTODIR)/dbdimp.h \
+	  oraperl.ph $(INST_LIB)/oraperl.ph \
+	  ocitrace.h $(INST_ARCHAUTODIR)/ocitrace.h \
+	  Oraperl.pm $(INST_LIB)/Oraperl.pm \
+	  lib/DBD/Oracle/GetInfo.pm blib\lib\DBD\Oracle\GetInfo.pm \
+	  mk.pm $(INST_ARCHAUTODIR)/mk.pm 
+	$(NOECHO) $(TOUCH) pm_to_blib
 
 
 # --- MakeMaker selfdocument section:

Modified: dbd-oracle/branches/DBDOracle8/Makefile.PL
==============================================================================
--- dbd-oracle/branches/DBDOracle8/Makefile.PL	(original)
+++ dbd-oracle/branches/DBDOracle8/Makefile.PL	Thu Jan  7 17:04:48 2010
@@ -1,4 +1,4 @@
-## Makefile.PL for DBD::Oracle - see README file for more information.
+## Makefile.PL for DBD::Oracle8 - see README file for more information.
 
 # vim: ts=8:sw=4
 
@@ -42,8 +42,8 @@
 $| = 1;
 
 my %opts = (
-    NAME => 'DBD::Oracle',
-    VERSION_FROM => 'Oracle.pm',
+    NAME => 'DBD::Oracle8',
+    VERSION_FROM => 'Oracle8.pm',
     PREREQ_PM => { "Test::Simple" => 0.40 }, # actually Test::More pkg in T::S dist
     EXE_FILES => [ "ora_explain$exe_ext" ],
     OBJECT => '$(O_FILES)',
@@ -58,7 +58,7 @@
 );
 if ($ExtUtils::MakeMaker::VERSION >= 5.43) {
     $opts{AUTHOR} = 'Tim Bunce ([email protected])';
-    $opts{ABSTRACT_FROM} = 'Oracle.pm';
+    $opts{ABSTRACT_FROM} = 'Oracle8.pm';
     $opts{PREREQ_PM} = { DBI => 0 };
     $opts{CAPI} = 'TRUE' if $Config{archname} =~ /-object\b/i;
 }
@@ -112,7 +112,7 @@
 # --- Introduction
 
 print qq{
-Configuring DBD::Oracle for perl $] on $os ($Config{archname})
+Configuring DBD::Oracle8 for perl $] on $os ($Config{archname})
 
 Remember to actually *READ* the README file! Especially if you have any problems.
 
@@ -1678,7 +1678,7 @@
 
     sub const_cccmd {
 	my ($self) = shift;
-	print "Using DBD::Oracle $self->{VERSION}.\n";
+	print "Using DBD::Oracle8 $self->{VERSION}.\n";
 
 	local($_) = $self->SUPER::const_cccmd(@_);
 	# If perl Makefile.PL *-g* then switch on debugging

Modified: dbd-oracle/branches/DBDOracle8/Oracle.obj
==============================================================================
Binary files. No diff available.

Modified: dbd-oracle/branches/DBDOracle8/dbdimp.obj
==============================================================================
Binary files. No diff available.

Modified: dbd-oracle/branches/DBDOracle8/mk.pm
==============================================================================
--- dbd-oracle/branches/DBDOracle8/mk.pm	(original)
+++ dbd-oracle/branches/DBDOracle8/mk.pm	Thu Jan  7 17:04:48 2010
@@ -1,220 +1,335 @@
 $dbd_oracle_mm_opts = {
-                        'INC' => '-Ic:/instant10.1/sdk/include -Ic:/instant10.1/rdbms/demo -IC:/Perl/site/lib/auto/DBI/',
+                        'NAME' => 'DBD::Oracle8',
+                        'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/',
+                        'LIBS' => [
+                                    '-LD:/oracle/ora81/oci/LIB/MSVC OCI'
+                                  ],
+                        'AUTHOR' => 'Tim Bunce ([email protected])',
+                        'DIR' => [],
+                        'DEFINE' => ' -DUTF8_SUPPORT -DORA_OCI_VERSION=\\"8.1.7.0\\"',
                         'dist' => {
                                     'DIST_DEFAULT' => 'clean distcheck disttest tardist',
-                                    'PREOP' => '$(MAKE) -f Makefile.old distdir',
                                     'COMPRESS' => 'gzip -v9',
+                                    'PREOP' => '$(MAKE) -f Makefile.old distdir',
                                     'SUFFIX' => 'gz'
                                   },
-                        'DEFINE' => ' -DUTF8_SUPPORT -DNEW_OCI_INIT -DORA_OCI_VERSION=\\"10.1.0.4\\"',
                         'OBJECT' => '$(O_FILES)',
+                        'clean' => {
+                                     'FILES' => 'xstmp.c Oracle.xsi dll.base dll.exp sqlnet.log libOracle.def ora_explain mk.pm DBD_ORA_OBJ.*'
+                                   },
                         'EXE_FILES' => [
                                          'ora_explain'
                                        ],
-                        'NAME' => 'DBD::Oracle',
-                        'VERSION_FROM' => 'Oracle.pm',
-                        'AUTHOR' => 'Tim Bunce ([email protected])',
-                        'DIR' => [],
-                        'ABSTRACT_FROM' => 'Oracle.pm',
-                        'LIBS' => [
-                                    '-Lc:/instant10.1/sdk/LIB/MSVC OCI'
-                                  ],
+                        'ABSTRACT_FROM' => 'Oracle8.pm',
+                        'VERSION_FROM' => 'Oracle8.pm',
                         'PREREQ_PM' => {
                                          'DBI' => 0
-                                       },
-                        'clean' => {
-                                     'FILES' => 'xstmp.c Oracle.xsi dll.base dll.exp sqlnet.log libOracle.def ora_explain mk.pm DBD_ORA_OBJ.*'
-                                   }
+                                       }
                       };
 $dbd_oracle_mm_self = bless( {
-                               'RM_RF' => '$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_rf',
-                               'INSTALLARCHLIB' => '$(PREFIX)\\lib',
-                               'INST_SCRIPT' => 'blib\\script',
-                               'INST_ARCHLIB' => 'blib\\arch',
-                               'INST_LIB' => 'blib\\lib',
-                               'NOECHO' => '@',
+                               'MM_Win32_VERSION' => '1.1401',
+                               'BSLOADLIBS' => '',
+                               'ECHO_N' => '$(ABSPERLRUN)  -e "print qq{@ARGV}" --',
+                               'BOOTDEP' => '',
+                               'INSTALLSITESCRIPT' => 'C:\\Perl\\site\\bin',
+                               'CCDLFLAGS' => ' ',
+                               'LDDLFLAGS' => '-dll -nologo -nodefaultlib -debug -opt:ref,icf  -libpath:"C:\\Perl\\lib\\CORE"  -machine:x86',
+                               'DESTINSTALLVENDORMAN3DIR' => '$(DESTDIR)$(INSTALLVENDORMAN3DIR)',
+                               'LDLOADLIBS' => 'D:\\oracle\\ora81\\oci\\LIB\\MSVC\\OCI.lib "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\oldnames.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\kernel32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\user32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\gdi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\winspool.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\comdlg32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\advapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\shell32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ole32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\oleaut32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\netapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\uuid.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ws2_32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\mpr.lib" "C:\\Program Files\\
 Microsoft Platform SDK\\Lib\\winmm.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\version.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbc32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbccp32.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\msvcrt.lib"',
+                               'INST_HTMLDIR' => 'blib\\html',
+                               'PREOP' => '$(NOECHO) $(NOOP)',
+                               'MACROSTART' => '',
+                               'DESTINSTALLVENDORHTMLDIR' => '$(DESTDIR)$(INSTALLVENDORHTMLDIR)',
+                               'XS_VERSION' => '1.00',
+                               'MAKEMAKER' => 'C:/Perl/lib/ExtUtils/MakeMaker.pm',
+                               'USEMAKEFILE' => '-f',
+                               'RM_RF' => '$(ABSPERLRUN) -MExtUtils::Command -e rm_rf',
+                               'PMLIBDIRS' => [
+                                                'lib'
+                                              ],
+                               'INST_LIBDIR' => '$(INST_LIB)\\DBD',
+                               'SITEARCHEXP' => 'C:\\Perl\\site\\lib',
+                               'ABSTRACT' => 'Oracle database driver for the DBI module',
+                               'INST_MAN1DIR' => 'blib\\man1',
+                               'MAN3EXT' => '3',
                                'XS' => {
                                          'Oracle.xs' => 'Oracle.c'
                                        },
-                               'ABSTRACT_FROM' => 'Oracle.pm',
-                               'INSTALLSCRIPT' => '$(PREFIX)\\bin',
-                               'MAKEFILE' => 'Makefile',
-                               'LIBS' => $dbd_oracle_mm_opts->{'LIBS'},
-                               'TEST_F' => '$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e test_f',
-                               'PARENT_NAME' => 'DBD',
-                               'DEV_NULL' => '> NUL',
-                               'INST_HTMLSCRIPTDIR' => undef,
-                               'INST_ARCHLIBDIR' => '$(INST_ARCHLIB)\\DBD',
-                               'MV' => '$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e mv',
-                               'SITELIBEXP' => 'C:\\Perl\\site\\lib',
-                               'LDLOADLIBS' => 'c:\\instant10.1\\sdk\\LIB\\MSVC\\OCI.lib "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\oldnames.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\kernel32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\user32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\gdi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\winspool.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\comdlg32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\advapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\shell32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ole32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\oleaut32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\netapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\uuid.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\wsock32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\mpr.lib" "C:\\
 Program Files\\Microsoft Platform SDK\\Lib\\winmm.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\version.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbc32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbccp32.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\msvcrt.lib"',
-                               'O_FILES' => [
-                                              'Oracle.obj',
-                                              'dbdimp.obj',
-                                              'oci8.obj'
-                                            ],
-                               'DLBASE' => '$(BASEEXT)',
+                               'MAKE' => 'nmake',
+                               'FULL_AR' => '',
                                'FULLPERL' => 'C:\\Perl\\bin\\perl.exe',
-                               'INST_ARCHAUTODIR' => '$(INST_ARCHLIB)\\auto\\$(FULLEXT)',
-                               'LIBPERL_A' => 'libperl.lib',
-                               'NOOP' => 'rem',
-                               'CCDLFLAGS' => ' ',
-                               'CCCDLFLAGS' => ' ',
-                               'INSTALLDIRS' => 'site',
-                               'INST_AUTODIR' => '$(INST_LIB)\\auto\\$(FULLEXT)',
+                               'DIR' => $dbd_oracle_mm_opts->{'DIR'},
+                               'CONFIG' => [
+                                             'ar',
+                                             'cc',
+                                             'cccdlflags',
+                                             'ccdlflags',
+                                             'dlext',
+                                             'dlsrc',
+                                             'exe_ext',
+                                             'full_ar',
+                                             'ld',
+                                             'lddlflags',
+                                             'ldflags',
+                                             'libc',
+                                             'lib_ext',
+                                             'obj_ext',
+                                             'osname',
+                                             'osvers',
+                                             'ranlib',
+                                             'sitelibexp',
+                                             'sitearchexp',
+                                             'so',
+                                             'vendorarchexp',
+                                             'vendorlibexp'
+                                           ],
+                               'DESTDIR' => '',
+                               'INSTALLSITEHTMLDIR' => 'C:\\Perl\\html',
+                               'MAN1PODS' => {
+                                               'ora_explain' => '$(INST_MAN1DIR)\\ora_explain.$(MAN1EXT)'
+                                             },
+                               'INSTALLSITEBIN' => 'C:\\Perl\\site\\bin',
+                               'CHMOD' => '$(ABSPERLRUN) -MExtUtils::Command -e chmod',
+                               'DESTINSTALLVENDORLIB' => '$(DESTDIR)$(INSTALLVENDORLIB)',
+                               'OBJ_EXT' => '.obj',
+                               'C' => [
+                                        'Oracle.c',
+                                        'dbdimp.c',
+                                        'oci8.c'
+                                      ],
+                               'EXE_FILES' => $dbd_oracle_mm_opts->{'EXE_FILES'},
+                               'TARFLAGS' => 'cvf',
+                               'PERL_INC' => 'C:\\Perl\\lib\\CORE',
+                               'HAS_LINK_CODE' => 1,
+                               'INSTALLPRIVLIB' => 'C:\\Perl\\lib',
+                               'SITELIBEXP' => 'C:\\Perl\\site\\lib',
+                               'DESTINSTALLPRIVLIB' => '$(DESTDIR)$(INSTALLPRIVLIB)',
+                               'VENDORLIBEXP' => '',
+                               'DEFINE' => ' -DUTF8_SUPPORT -DORA_OCI_VERSION=\\"8.1.7.0\\"',
+                               'FULLEXT' => 'DBD\\Oracle8',
+                               'MAKEFILE' => 'Makefile',
                                'PL_FILES' => {
                                                'ora_explain.PL' => 'ora_explain'
                                              },
-                               'INSTALLPRIVLIB' => '$(PREFIX)\\lib',
-                               'HTMLEXT' => 'html',
-                               'NAME_SYM' => 'DBD_Oracle',
-                               'OSVERS' => '4.0',
-                               'MAKE_APERL_FILE' => 'Makefile.aperl',
-                               'PERL' => 'C:\\Perl\\bin\\perl.exe',
+                               'VENDORARCHEXP' => '',
+                               'MM_VERSION' => '6.3201',
+                               'INSTALLSCRIPT' => 'C:\\Perl\\bin',
+                               'CC' => 'cl',
+                               'LIBS' => $dbd_oracle_mm_opts->{'LIBS'},
+                               'DLEXT' => 'dll',
+                               'EQUALIZE_TIMESTAMP' => '$(ABSPERLRUN) "-MExtUtils::Command" -e eqtime',
+                               'XS_VERSION_MACRO' => 'XS_VERSION',
+                               'VERBINST' => 0,
+                               'TAR' => 'tar',
+                               'ABSPERL' => '$(PERL)',
+                               'DESTINSTALLARCHLIB' => '$(DESTDIR)$(INSTALLARCHLIB)',
+                               'INST_STATIC' => '$(INST_ARCHAUTODIR)\\$(BASEEXT)$(LIB_EXT)',
+                               'DISTVNAME' => 'DBD-Oracle8-1.00',
+                               'ABSTRACT_FROM' => 'Oracle8.pm',
+                               'DESTINSTALLSCRIPT' => '$(DESTDIR)$(INSTALLSCRIPT)',
+                               'INST_AUTODIR' => '$(INST_LIB)\\auto\\$(FULLEXT)',
                                'RESULT' => [
-                                             '# This Makefile is for the DBD::Oracle extension to perl.
+                                             '# This Makefile is for the DBD::Oracle8 extension to perl.
 #
 # It was generated automatically by MakeMaker version
-# 5.45 (Revision: 1.222) from the contents of
+# 6.3201 (Revision: 19606) from the contents of
 # Makefile.PL. Don\'t edit this file, edit Makefile.PL instead.
 #
-#	ANY CHANGES MADE HERE WILL BE LOST!
+#       ANY CHANGES MADE HERE WILL BE LOST!
 #
 #   MakeMaker ARGV: ()
 #
 #   MakeMaker Parameters:
 ',
-                                             '#	ABSTRACT_FROM => q[Oracle.pm]',
-                                             '#	AUTHOR => q[Tim Bunce ([email protected])]',
-                                             '#	DEFINE => q[ -DUTF8_SUPPORT -DNEW_OCI_INIT -DORA_OCI_VERSION=\\"10.1.0.4\\"]',
-                                             '#	DIR => []',
-                                             '#	EXE_FILES => [q[ora_explain]]',
-                                             '#	INC => q[-Ic:/instant10.1/sdk/include -Ic:/instant10.1/rdbms/demo -IC:/Perl/site/lib/auto/DBI/]',
-                                             '#	LIBS => [q[-Lc:/instant10.1/sdk/LIB/MSVC OCI]]',
-                                             '#	NAME => q[DBD::Oracle]',
-                                             '#	OBJECT => q[$(O_FILES)]',
-                                             '#	PREREQ_PM => { DBI=>q[0] }',
-                                             '#	VERSION_FROM => q[Oracle.pm]',
-                                             '#	clean => { FILES=>q[xstmp.c Oracle.xsi dll.base dll.exp sqlnet.log libOracle.def ora_explain mk.pm DBD_ORA_OBJ.*] }',
-                                             '#	dist => { DIST_DEFAULT=>q[clean distcheck disttest tardist], PREOP=>q[$(MAKE) -f Makefile.old distdir], COMPRESS=>q[gzip -v9], SUFFIX=>q[gz] }',
+                                             '#     ABSTRACT_FROM => q[Oracle8.pm]',
+                                             '#     AUTHOR => q[Tim Bunce ([email protected])]',
+                                             '#     DEFINE => q[ -DUTF8_SUPPORT -DORA_OCI_VERSION=\\"8.1.7.0\\"]',
+                                             '#     DIR => []',
+                                             '#     EXE_FILES => [q[ora_explain]]',
+                                             '#     INC => q[-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/]',
+                                             '#     LIBS => [q[-LD:/oracle/ora81/oci/LIB/MSVC OCI]]',
+                                             '#     NAME => q[DBD::Oracle8]',
+                                             '#     OBJECT => q[$(O_FILES)]',
+                                             '#     PREREQ_PM => { DBI=>q[0] }',
+                                             '#     VERSION_FROM => q[Oracle8.pm]',
+                                             '#     clean => { FILES=>q[xstmp.c Oracle.xsi dll.base dll.exp sqlnet.log libOracle.def ora_explain mk.pm DBD_ORA_OBJ.*] }',
+                                             '#     dist => { DIST_DEFAULT=>q[clean distcheck disttest tardist], COMPRESS=>q[gzip -v9], PREOP=>q[$(MAKE) -f Makefile.old distdir], SUFFIX=>q[gz] }',
                                              '
 # --- MakeMaker post_initialize section:'
                                            ],
-                               'INSTALLHTMLSCRIPTDIR' => undef,
-                               'HTMLLIBPODS' => {},
-                               'EXE_EXT' => '.exe',
-                               'LDFLAGS' => '-nologo -nodefaultlib -debug -opt:ref,icf  -libpath:"C:\\Perl\\lib\\CORE"  -machine:x86',
-                               'CC' => 'cl',
-                               'INSTALLHTMLSITELIBDIR' => undef,
-                               'PERLMAINCC' => '$(CC)',
-                               'XS_VERSION' => '1.17',
-                               'DEFINE' => ' -DUTF8_SUPPORT -DNEW_OCI_INIT -DORA_OCI_VERSION=\\"10.1.0.4\\"',
+                               'FULLPERLRUNINST' => '$(FULLPERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"',
                                'MAP_TARGET' => 'perl',
-                               'INSTALLSITEARCH' => 'C:\\Perl\\site\\lib',
-                               'INST_BIN' => 'blib\\bin',
-                               'INST_HTMLLIBDIR' => undef,
-                               'TOUCH' => '$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e touch',
-                               'CP' => '$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e cp',
-                               'PERL_SRC' => undef,
-                               'INST_LIBDIR' => '$(INST_LIB)\\DBD',
-                               'EXTRALIBS' => 'c:\\instant10.1\\sdk\\LIB\\MSVC\\OCI.lib "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\oldnames.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\kernel32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\user32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\gdi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\winspool.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\comdlg32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\advapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\shell32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ole32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\oleaut32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\netapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\uuid.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\wsock32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\mpr.lib" "C:\\P
 rogram Files\\Microsoft Platform SDK\\Lib\\winmm.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\version.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbc32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbccp32.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\msvcrt.lib"',
-                               'OSNAME' => 'MSWin32',
-                               'EXE_FILES' => $dbd_oracle_mm_opts->{'EXE_FILES'},
-                               'INSTALLHTMLPRIVLIBDIR' => undef,
-                               'CHMOD' => '$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e chmod',
-                               'LDFROM' => '$(OBJECT)',
-                               'PMLIBDIRS' => [
-                                                'lib'
-                                              ],
-                               'DLEXT' => 'dll',
-                               'C' => [
-                                        'Oracle.c',
-                                        'dbdimp.c',
-                                        'oci8.c'
-                                      ],
-                               'OBJ_EXT' => '.obj',
-                               'HTMLSCRIPTPODS' => {},
+                               'INSTALLMAN3DIR' => 'C:\\Perl\\man\\man3',
+                               'PERLPREFIX' => 'C:\\Perl',
+                               'AUTHOR' => 'Tim Bunce ([email protected])',
+                               'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/',
+                               'LDFLAGS' => '-nologo -nodefaultlib -debug -opt:ref,icf  -libpath:"C:\\Perl\\lib\\CORE"  -machine:x86',
+                               'INSTALLVENDORHTMLDIR' => 'C:\\Perl\\html',
+                               'dist' => $dbd_oracle_mm_opts->{'dist'},
+                               'INSTALLVENDORMAN1DIR' => '',
+                               'MAKEFILE_OLD' => 'Makefile.old',
                                'H' => [
                                         'Oracle.h',
                                         'dbdimp.h',
                                         'dbivport.h',
                                         'ocitrace.h'
                                       ],
-                               'INSTALLBIN' => '$(PREFIX)\\bin',
-                               'FIRST_MAKEFILE' => 'Makefile',
-                               'CONFIG' => [
-                                             'ar',
-                                             'cc',
-                                             'cccdlflags',
-                                             'ccdlflags',
-                                             'dlext',
-                                             'dlsrc',
-                                             'ld',
-                                             'lddlflags',
-                                             'ldflags',
-                                             'libc',
-                                             'lib_ext',
-                                             'obj_ext',
-                                             'osname',
-                                             'osvers',
-                                             'ranlib',
-                                             'sitelibexp',
-                                             'sitearchexp',
-                                             'so',
-                                             'exe_ext',
-                                             'full_ar'
-                                           ],
-                               'SKIPHASH' => {},
+                               'PERLRUNINST' => '$(PERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"',
+                               'CI' => 'ci -u',
+                               'DESTINSTALLBIN' => '$(DESTDIR)$(INSTALLBIN)',
+                               'DESTINSTALLVENDORMAN1DIR' => '$(DESTDIR)$(INSTALLVENDORMAN1DIR)',
+                               'INST_ARCHLIBDIR' => '$(INST_ARCHLIB)\\DBD',
+                               'OBJECT' => '$(O_FILES)',
+                               'NAME_SYM' => 'DBD_Oracle8',
                                'RANLIB' => 'rem',
-                               'clean' => $dbd_oracle_mm_opts->{'clean'},
-                               'DLSRC' => 'dl_win32.xs',
-                               'MAN1PODS' => {},
-                               'SITEARCHEXP' => 'C:\\Perl\\site\\lib',
+                               'DIRFILESEP' => '^\\',
+                               'POSTOP' => '$(NOECHO) $(NOOP)',
+                               'INSTALLVENDORBIN' => '',
+                               'COMPRESS' => 'gzip --best',
+                               'SUFFIX' => '.gz',
+                               'MAN1EXT' => '1',
                                'PERL_LIB' => 'C:\\Perl\\lib',
-                               'INST_EXE' => 'blib\\script',
-                               'PERL_INC' => 'C:\\Perl\\lib\\CORE',
-                               'AUTHOR' => 'Tim Bunce ([email protected])',
-                               'VERSION' => '1.17',
-                               'DIR' => $dbd_oracle_mm_opts->{'DIR'},
-                               'SO' => 'dll',
-                               'MAN3PODS' => {},
-                               'INC' => '-Ic:/instant10.1/sdk/include -Ic:/instant10.1/rdbms/demo -IC:/Perl/site/lib/auto/DBI/',
-                               'LD' => 'link',
-                               'DISTNAME' => 'DBD-Oracle',
-                               'OBJECT' => '$(O_FILES)',
+                               'ECHO' => '$(ABSPERLRUN) -l -e "print qq{@ARGV}" --',
+                               'EXPORT_LIST' => '$(BASEEXT).def',
+                               'INST_BOOT' => '$(INST_ARCHAUTODIR)\\$(BASEEXT).bs',
+                               'MV' => '$(ABSPERLRUN) -MExtUtils::Command -e mv',
+                               'OSVERS' => '5.00',
                                'LD_RUN_PATH' => '',
-                               'NAME' => 'DBD::Oracle',
-                               'UMASK_NULL' => 'umask 0',
+                               'MKPATH' => '$(ABSPERLRUN) "-MExtUtils::Command" -e mkpath',
+                               'DESTINSTALLMAN1DIR' => '$(DESTDIR)$(INSTALLMAN1DIR)',
+                               'OSNAME' => 'MSWin32',
+                               'AR' => 'lib',
+                               'O_FILES' => [
+                                              'Oracle.obj',
+                                              'dbdimp.obj',
+                                              'oci8.obj'
+                                            ],
+                               'FIXIN' => 'pl2bat.bat',
+                               'DIST_DEFAULT' => 'tardist',
+                               'SKIPHASH' => {},
+                               'NOOP' => 'rem',
                                'PERL_ARCHLIB' => 'C:\\Perl\\lib',
-                               'INSTALLMAN1DIR' => '',
-                               'INST_MAN1DIR' => '',
-                               'BASEEXT' => 'Oracle',
-                               'VERSION_SYM' => '1_17',
+                               'VERSION_SYM' => '1_00',
+                               'VERSION_MACRO' => 'VERSION',
+                               'WARN_IF_OLD_PACKLIST' => '$(ABSPERLRUN) "-MExtUtils::Command::MM" -e warn_if_old_packlist',
+                               'MM_REVISION' => '19606',
+                               'RM_F' => '$(ABSPERLRUN) -MExtUtils::Command -e rm_f',
+                               'LIBC' => 'msvcrt.lib',
+                               'UNINST' => 0,
+                               'PERLRUN' => '$(PERL)',
+                               'LINKTYPE' => 'dynamic',
+                               'INSTALLVENDORLIB' => '',
+                               'DEV_NULL' => '> NUL',
+                               'DLSRC' => 'dl_win32.xs',
+                               'INST_ARCHAUTODIR' => '$(INST_ARCHLIB)\\auto\\$(FULLEXT)',
+                               'DESTINSTALLSITEBIN' => '$(DESTDIR)$(INSTALLSITEBIN)',
+                               'MACROEND' => '',
+                               'ARGS' => {
+                                           'NAME' => 'DBD::Oracle8',
+                                           'INC' => '-ID:/oracle/ora81/oci/include -ID:/oracle/ora81/rdbms/demo -IC:/Perl/site/lib/auto/DBI/',
+                                           'LIBS' => $dbd_oracle_mm_opts->{'LIBS'},
+                                           'AUTHOR' => 'Tim Bunce ([email protected])',
+                                           'DIR' => $dbd_oracle_mm_opts->{'DIR'},
+                                           'DEFINE' => ' -DUTF8_SUPPORT -DORA_OCI_VERSION=\\"8.1.7.0\\"',
+                                           'dist' => $dbd_oracle_mm_opts->{'dist'},
+                                           'OBJECT' => '$(O_FILES)',
+                                           'clean' => $dbd_oracle_mm_opts->{'clean'},
+                                           'EXE_FILES' => $dbd_oracle_mm_opts->{'EXE_FILES'},
+                                           'ABSTRACT_FROM' => 'Oracle8.pm',
+                                           'VERSION_FROM' => 'Oracle8.pm',
+                                           'PREREQ_PM' => $dbd_oracle_mm_opts->{'PREREQ_PM'}
+                                         },
+                               'CP' => '$(ABSPERLRUN) -MExtUtils::Command -e cp',
+                               'DEFINE_VERSION' => '-D$(VERSION_MACRO)=\\"$(VERSION)\\"',
                                'PREREQ_PM' => $dbd_oracle_mm_opts->{'PREREQ_PM'},
-                               'INSTALLMAN3DIR' => '',
-                               'MAN1EXT' => '1',
-                               'INST_MAN3DIR' => '',
+                               'DESTINSTALLSITELIB' => '$(DESTDIR)$(INSTALLSITELIB)',
+                               'INST_LIB' => 'blib\\lib',
+                               'INST_DYNAMIC' => '$(INST_ARCHAUTODIR)\\$(DLBASE).$(DLEXT)',
+                               'FULLPERLRUN' => '$(FULLPERL)',
+                               'INSTALLSITEMAN1DIR' => '$(INSTALLMAN1DIR)',
+                               'DESTINSTALLSITEMAN3DIR' => '$(DESTDIR)$(INSTALLSITEMAN3DIR)',
+                               'MOD_INSTALL' => '$(ABSPERLRUN) -MExtUtils::Install -e "install({@ARGV}, \'$(VERBINST)\', 0, \'$(UNINST)\');" --',
+                               'DLBASE' => '$(BASEEXT)',
+                               'INST_MAN3DIR' => 'blib\\man3',
+                               'CCCDLFLAGS' => ' ',
+                               'INSTALLSITEARCH' => 'C:\\Perl\\site\\lib',
+                               'PMLIBPARENTDIRS' => [
+                                                      'lib'
+                                                    ],
+                               'XS_DEFINE_VERSION' => '-D$(XS_VERSION_MACRO)=\\"$(XS_VERSION)\\"',
+                               'DESTINSTALLSITESCRIPT' => '$(DESTDIR)$(INSTALLSITESCRIPT)',
+                               'SHAR' => 'shar',
+                               'PERLMAINCC' => '$(CC)',
+                               'RCS_LABEL' => 'rcs -Nv$(VERSION_SYM): -q',
+                               'NAME' => 'DBD::Oracle8',
+                               'PARENT_NAME' => 'DBD',
+                               'INSTALLSITELIB' => 'C:\\Perl\\site\\lib',
+                               'MAKE_APERL_FILE' => 'Makefile.aperl',
+                               'ZIP' => 'zip',
+                               'VERSION_FROM' => 'Oracle8.pm',
+                               'SITEPREFIX' => 'C:\\Perl\\site',
+                               'INSTALLVENDORSCRIPT' => '',
+                               'TO_UNIX' => '$(NOECHO) $(NOOP)',
+                               'PERL' => 'C:\\Perl\\bin\\perl.exe',
+                               'DESTINSTALLVENDORARCH' => '$(DESTDIR)$(INSTALLVENDORARCH)',
+                               'NOECHO' => '@',
+                               'DESTINSTALLVENDORBIN' => '$(DESTDIR)$(INSTALLVENDORBIN)',
+                               'DESTINSTALLHTMLDIR' => '$(DESTDIR)$(INSTALLHTMLDIR)',
+                               'PERM_RW' => 644,
+                               'UMASK_NULL' => 'umask 0',
+                               'DOC_INSTALL' => '$(ABSPERLRUN) "-MExtUtils::Command::MM" -e perllocal_install',
+                               'TOUCH' => '$(ABSPERLRUN) -MExtUtils::Command -e touch',
+                               'LD' => 'link',
+                               'PERL_SRC' => undef,
+                               'DESTINSTALLMAN3DIR' => '$(DESTDIR)$(INSTALLMAN3DIR)',
+                               'ZIPFLAGS' => '-r',
+                               'DISTNAME' => 'DBD-Oracle8',
+                               'INST_BIN' => 'blib\\bin',
+                               'FIRST_MAKEFILE' => 'Makefile',
+                               'VENDORPREFIX' => '',
+                               'LDFROM' => '$(OBJECT)',
+                               'clean' => $dbd_oracle_mm_opts->{'clean'},
+                               'PREFIX' => '$(SITEPREFIX)',
+                               'INSTALLDIRS' => 'site',
+                               'INST_ARCHLIB' => 'blib\\arch',
+                               'INSTALLHTMLDIR' => 'C:\\Perl\\html',
+                               'PERL_ARCHIVE' => '$(PERL_INC)\\perl58.lib',
+                               'INSTALLVENDORARCH' => '',
+                               'DESTINSTALLSITEMAN1DIR' => '$(DESTDIR)$(INSTALLSITEMAN1DIR)',
+                               'INSTALLBIN' => 'C:\\Perl\\bin',
+                               'INSTALLSITEMAN3DIR' => '$(INSTALLMAN3DIR)',
+                               'PERL_ARCHIVE_AFTER' => '',
+                               'MAN3PODS' => {
+                                               'Oracle8.pm' => '$(INST_MAN3DIR)\\DBD\\Oracle8.$(MAN3EXT)',
+                                               'Oraperl.pm' => '$(INST_MAN3DIR)\\DBD\\Oraperl.$(MAN3EXT)'
+                                             },
+                               'LIBPERL_A' => 'libperl.lib',
+                               'INSTALLARCHLIB' => 'C:\\Perl\\lib',
+                               'LIB_EXT' => '.lib',
+                               'DESTINSTALLSITEHTMLDIR' => '$(DESTDIR)$(INSTALLSITEHTMLDIR)',
+                               'AR_STATIC_ARGS' => 'cr',
+                               'INSTALLVENDORMAN3DIR' => '',
+                               'EXE_EXT' => '.exe',
+                               'EXTRALIBS' => 'D:\\oracle\\ora81\\oci\\LIB\\MSVC\\OCI.lib "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\oldnames.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\kernel32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\user32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\gdi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\winspool.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\comdlg32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\advapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\shell32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ole32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\oleaut32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\netapi32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\uuid.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\ws2_32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\mpr.lib" "C:\\Program Files\\M
 icrosoft Platform SDK\\Lib\\winmm.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\version.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbc32.lib" "C:\\Program Files\\Microsoft Platform SDK\\Lib\\odbccp32.lib" "C:\\Program Files\\Microsoft Visual Studio .NET 2003\\Vc7\\lib\\msvcrt.lib"',
+                               'PERM_RWX' => 755,
+                               'DESTINSTALLSITEARCH' => '$(DESTDIR)$(INSTALLSITEARCH)',
+                               'ABSPERLRUN' => '$(ABSPERL)',
+                               'DESTINSTALLVENDORSCRIPT' => '$(DESTDIR)$(INSTALLVENDORSCRIPT)',
+                               'BASEEXT' => 'Oracle8',
+                               'TEST_F' => '$(ABSPERLRUN) -MExtUtils::Command -e test_f',
                                'PM' => {
+                                         'Oracle8.pm' => '$(INST_LIB)\\DBD\\Oracle8.pm',
                                          'oraperl.ph' => '$(INST_LIB)/oraperl.ph',
-                                         'lib/DBD/Oracle/GetInfo.pm' => '$(INST_LIB)\\DBD\\Oracle\\GetInfo.pm',
-                                         'Oracle.pm' => '$(INST_LIBDIR)\\Oracle.pm',
-                                         'mk.pm' => '$(INST_LIBDIR)\\mk.pm',
-                                         'Oraperl.pm' => '$(INST_LIB)/Oraperl.pm'
+                                         'Oraperl.pm' => '$(INST_LIB)/Oraperl.pm',
+                                         'lib/DBD/Oracle/GetInfo.pm' => 'blib\\lib\\DBD\\Oracle\\GetInfo.pm',
+                                         'mk.pm' => '$(INST_LIB)\\DBD\\mk.pm'
                                        },
-                               'dist' => $dbd_oracle_mm_opts->{'dist'},
-                               'VERSION_FROM' => 'Oracle.pm',
-                               'LIB_EXT' => '.lib',
-                               'FULL_AR' => '',
-                               'INSTALLSITELIB' => 'C:\\Perl\\site\\lib',
-                               'MAN3EXT' => '3',
-                               'LDDLFLAGS' => '-dll -nologo -nodefaultlib -debug -opt:ref,icf  -libpath:"C:\\Perl\\lib\\CORE"  -machine:x86',
-                               'AR_STATIC_ARGS' => 'cr',
-                               'PREFIX' => 'C:\\Perl',
-                               'FULLEXT' => 'DBD\\Oracle',
-                               'AR' => 'lib',
-                               'BOOTDEP' => '',
-                               'BSLOADLIBS' => '',
-                               'LIBC' => 'msvcrt.lib',
-                               'RM_F' => '$(PERL) -I$(PERL_ARCHLIB) -I$(PERL_LIB) -MExtUtils::Command -e rm_f',
-                               'LINKTYPE' => 'dynamic'
+                               'ABSPERLRUNINST' => '$(ABSPERLRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"',
+                               'PERL_CORE' => 0,
+                               'INSTALLMAN1DIR' => 'C:\\Perl\\man\\man1',
+                               'SO' => 'dll',
+                               'VERSION' => '1.00',
+                               'DIST_CP' => 'best',
+                               'INST_SCRIPT' => 'blib\\script',
+                               'UNINSTALL' => '$(ABSPERLRUN) "-MExtUtils::Command::MM" -e uninstall'
                              }, 'PACK001' );

Modified: dbd-oracle/branches/DBDOracle8/oci8.obj
==============================================================================
Binary files. No diff available.

Modified: dbd-oracle/branches/DBDOracle8/vc70.pdb
==============================================================================
Binary files. No diff available.
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.