--- ../../java-gcj-compat-1.0.80/generate-cacerts.pl	2007-07-04 23:01:44.000000000 +0200
+++ contrib/generate-cacerts.pl.in	2009-04-25 11:05:14.000000000 +0200
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2007 Red Hat, Inc.
+# Copyright (C) 2007, 2009 Free Software Foundation
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,7 +17,8 @@
 
 # First extract each of OpenSSL's bundled certificates into its own
 # aliased filename.
-$file = "/etc/pki/tls/cert.pem";
+chomp($file=@ARGV[0]);
+$file = "/etc/pki/tls/cert.pem" unless $file ne "";
 open(CERTS, $file);
 @certs = <CERTS>;
 close(CERTS);
@@ -90,7 +91,7 @@
 $certs_written_count = 0;
 foreach $pem_file (@pem_files)
 {
-	 system "yes | gkeytool -import -alias `basename $pem_file .pem`".
+	 system "yes | gkeytool@gcc_suffix@ -import -alias `basename $pem_file .pem`".
 		  " -keystore cacerts -storepass '' -file $pem_file".
 		  " 2>&1 >/dev/null";
 	 unlink($pem_file);