logo       
Google Custom Search
    AddThis Social Bookmark Button

src/tools/shared-misc gen-makefile.in,1.34,1.35: msg#00196

Subject: src/tools/shared-misc gen-makefile.in,1.34,1.35
Update of /var/lib/cvs/src/tools/shared-misc
In directory cantor:/tmp/cvs-serv26666/shared-misc

Modified Files:
        gen-makefile.in 
Log Message:
Updates to support the win32 port.


Index: gen-makefile.in
===================================================================
RCS file: /var/lib/cvs/src/tools/shared-misc/gen-makefile.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gen-makefile.in     1 Aug 2002 00:58:17 -0000       1.34
+++ gen-makefile.in     20 Sep 2002 23:51:16 -0000      1.35
@@ -1083,7 +1083,9 @@
     local ($from_file, $to_file, $executable_permissions) = @_;
 
     # GNU DESTDIR, not the $destdir variable.
-    $to_file = "\${DESTDIR}$to_file";
+    unless ($host_platform{'default_features'} =~ /compiled-for-win32/i) {
+       $to_file = "\${DESTDIR}$to_file";
+       }
 
     print "\n$to_file: $from_file\n";
     if ($host_platform{'default_features'} =~ /compiled-for-win32/i) {
@@ -1183,13 +1185,18 @@
 #
 sub install_library {
     local ($dest_dir, $library, $shared_library) = @_;
+       my ($gnu_dest_dir) = $dest_dir;
 
     # Don't generate any install rules unless destdir is set.
     $dest_dir || return;
+       
+    unless ($host_platform{'default_features'} =~ /compiled-for-win32/i) {
+       $gnu_dest_file = "\${DESTDIR}$gnu_dest_dir";
+       }
 
-    print "\n\${DESTDIR}$dest_dir/$library: $library\n";
-    print "\t$install_library $library \${DESTDIR}$dest_dir/$library\n\n";
-    push(@install_dependencies, "\${DESTDIR}$dest_dir/$library");
+    print "\n\$gnu_dest_dir/$library: $library\n";
+    print "\t$install_library $library \$gnu_dest_dir/$library\n\n";
+    push(@install_dependencies, "\$gnu_dest_dir/$library");
 }
 
 





Try Searching:
servers, voip, java, networking, microsoft ...
<Prev in Thread] Current Thread [Next in Thread>