@@ -3,7 +3,7 @@ package Install;
33#
44# Package that provides 'make install' functionality for msvc builds
55#
6- # $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.12 2007/04/23 17: 18:58 mha Exp $
6+ # $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.13 2007/04/25 18:58:33 mha Exp $
77#
88use strict;
99use warnings;
@@ -299,9 +299,9 @@ sub CopyIncludeFiles
299299{
300300my $target =shift ;
301301
302- EnsureDirectories($target ,' include' ,' include/libpq' ,' include/postgresql ' ,
303- ' include/postgresql/ internal' ,' include/postgresql /internal/libpq' ,
304- ' include/postgresql/ server' );
302+ EnsureDirectories($target ,' include' ,' include/libpq' ,
303+ ' include/internal' ,' include/internal/libpq' ,
304+ ' include/server' );
305305
306306 CopyFiles(
307307' Public headers' ,
@@ -314,24 +314,24 @@ sub CopyIncludeFiles
314314 CopyFiles(' Libpq headers' ,$target .' /include/' ,' src/interfaces/libpq/' ,' libpq-fe.h' );
315315 CopyFiles(
316316' Libpq internal headers' ,
317- $target .' /include/postgresql/ internal/' ,
317+ $target .' /include/internal/' ,
318318' src/interfaces/libpq/' ,' libpq-int.h' ,' pqexpbuffer.h'
319319 );
320320
321321 CopyFiles(
322322' Internal headers' ,
323- $target .' /include/postgresql/ internal/' ,
323+ $target .' /include/internal/' ,
324324' src/include/' ,' c.h' ,' port.h' ,' postgres_fe.h'
325325 );
326- copy(' src/include/libpq/pqcomm.h' ,$target .' /include/postgresql/ internal/libpq/' )
326+ copy(' src/include/libpq/pqcomm.h' ,$target .' /include/internal/libpq/' )
327327 || croak' Could not copy pqcomm.h' ;
328328
329329 CopyFiles(
330330' Server headers' ,
331- $target .' /include/postgresql/ server/' ,
331+ $target .' /include/server/' ,
332332' src/include/' ,' pg_config.h' ,' pg_config_os.h'
333333 );
334- CopySetOfFiles(' ' ," src\\ include\\ *.h" ,$target .' /include/postgresql/ server/' , 1, 1);
334+ CopySetOfFiles(' ' ," src\\ include\\ *.h" ,$target .' /include/server/' , 1, 1);
335335my $D ;
336336opendir ($D ,' src/include' ) || croak" Could not opendir on src/include!\n " ;
337337
@@ -341,9 +341,9 @@ sub CopyIncludeFiles
341341next if ($d eq ' CVS' );
342342next unless (-d ' src/include/' .$d );
343343
344- EnsureDirectories($target .' /include/postgresql/ server' ,$d );
344+ EnsureDirectories($target .' /include/server' ,$d );
345345system (
346- " xcopy /s /i /q /r /y src\\ include\\ $d \\ *.h\" $target \\ include\\ postgresql \\ server\\ $d \\\" " )
346+ " xcopy /s /i /q /r /y src\\ include\\ $d \\ *.h\" $target \\ include\\ server\\ $d \\\" " )
347347 && croak(" Failed to copy include directory$d \n " );
348348 }
349349closedir ($D );
@@ -358,10 +358,10 @@ sub CopyIncludeFiles
358358' ecpg_config.h' ,split /\s +/,$1
359359 );
360360$mf =~/ ^informix_headers\s *=\s *(.*)$ /m || croak" Could not find informix_headers line\n " ;
361- EnsureDirectories($target .' /include/postgresql ' ,' informix' ,' informix/esql' );
361+ EnsureDirectories($target .' /include' ,' informix' ,' informix/esql' );
362362 CopyFiles(
363363' ECPG informix headers' ,
364- $target .' /include/postgresql/ informix/esql/' ,
364+ $target .' /include/informix/esql/' ,
365365' src/interfaces/ecpg/include/' ,
366366split /\s +/,$1
367367 );