Patch for perl in odd places

From: Christian Borup <borup borup com>
To: gtk-perl-list gnome org
Subject: Patch for perl in odd places
Date: Thu, 22 Mar 2001 22:30:28 +0100

Hi all

Attached is a patch that make the build setup for gnome-perl even if
there isn't a perl in /usr/bin.

./borup

Index: Depends.pm
===================================================================
RCS file: /cvs/gnome/gnome-perl/Depends.pm,v
retrieving revision 1.7
diff -c -r1.7 Depends.pm
*** Depends.pm  2001/02/11 22:39:10     1.7
--- Depends.pm  2001/03/22 21:26:02
***************
*** 1,4 ****
--- 1,5 ----
  package ExtUtils::Depends;
+ use Config;
  use File::Basename;
  use Carp;
  use Cwd;
***************
*** 275,281 ****
        
        $pm->{$filename} = '$(INST_ARCHLIBDIR)/'."$mdir/Install/Files.pm";
  
!       print $file "#!/usr/bin/perl\n\npackage ${name}::Install::Files;\n\n";
  
        foreach my $tag (sort keys %{$self}) {
                next if $tag =~ /^_/;
--- 276,282 ----
        
        $pm->{$filename} = '$(INST_ARCHLIBDIR)/'."$mdir/Install/Files.pm";
  
!       print $file "$Config{'startperl'}\n\npackage ${name}::Install::Files;\n\n";
  
        foreach my $tag (sort keys %{$self}) {
                next if $tag =~ /^_/;
Index: Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/Makefile.PL,v
retrieving revision 1.65
diff -c -r1.65 Makefile.PL
*** Makefile.PL 2001/03/12 21:29:41     1.65
--- Makefile.PL 2001/03/22 21:26:04
***************
*** 1,4 ****
! #!/usr/bin/perl -w
  use ExtUtils::MakeMaker;
  use Config;
  
--- 1,4 ----
! 
  use ExtUtils::MakeMaker;
  use Config;
  
Index: test.pl
===================================================================
RCS file: /cvs/gnome/gnome-perl/test.pl,v
retrieving revision 1.15
diff -c -r1.15 test.pl
*** test.pl     1999/11/06 14:10:46     1.15
--- test.pl     2001/03/22 21:26:05
***************
*** 1,5 ****
- #!/usr/bin/perl -w
- 
  # Note: this is a generic launcher script, designed to work with all Gtk versions.
  # If you are interested in the Perl port of the Gtk widget demo, please look at
  # Gtk/samples/test.pl.
--- 1,3 ----
Index: Applet/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/Applet/Makefile.PL,v
retrieving revision 1.4
diff -c -r1.4 Makefile.PL
*** Applet/Makefile.PL  2001/03/11 14:39:46     1.4
--- Applet/Makefile.PL  2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use File::Basename;
  use blib '..';
  use blib '../Gnome';
***************
*** 65,72 ****
  
  # documentation
  gendefs::gen_doc('gnomeapplet');
! system("../tools/gendoc.pl", "-t", 'gnomeapplet', $gp->get_xs);
! system("../tools/gpdoc2pod", "-t", 'GnomeApplet');
  
  WriteMakefile(
        'NAME'      => 'Gnome::Applet',
--- 66,73 ----
  
  # documentation
  gendefs::gen_doc('gnomeapplet');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'gnomeapplet', $gp->get_xs);
! system($Config{perlpath}, "../tools/gpdoc2pod", "-t", 'GnomeApplet');
  
  WriteMakefile(
        'NAME'      => 'Gnome::Applet',
***************
*** 92,98 ****
        $(PERL) ../tools/genext.pl GnomeApplet </dev/null
  
  gendoc:
!       ../tools/gendoc.pl -t gnomeapplet $(XS_FILES)
  
  ';
  
--- 93,99 ----
        $(PERL) ../tools/genext.pl GnomeApplet </dev/null
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl -t gnomeapplet $(XS_FILES)
  
  ';
  
Index: Bonobo/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/Bonobo/Makefile.PL,v
retrieving revision 1.8
diff -c -r1.8 Makefile.PL
*** Bonobo/Makefile.PL  2001/03/11 14:39:47     1.8
--- Bonobo/Makefile.PL  2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use blib '..';
  use blib '../GdkImlib';
  use blib '../Gnome';
***************
*** 61,68 ****
  
  # documentation
  gendefs::gen_doc('bonobo');
! system("../tools/gendoc.pl", "-t", 'bonobo', $bonobo->get_xs);
! system("../tools/gpdoc2pod", "-t", 'Bonobo');
  
  WriteMakefile(
        'NAME'      => 'Bonobo',
--- 62,69 ----
  
  # documentation
  gendefs::gen_doc('bonobo');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'bonobo', $bonobo->get_xs);
! system($Config{perlpath}, "../tools/gpdoc2pod", "-t", 'Bonobo');
  
  WriteMakefile(
        'NAME'      => 'Bonobo',
Index: GdkImlib/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/GdkImlib/Makefile.PL,v
retrieving revision 1.10
diff -c -r1.10 Makefile.PL
*** GdkImlib/Makefile.PL        2001/03/11 14:39:47     1.10
--- GdkImlib/Makefile.PL        2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use Cwd;
  use blib '../Gtk';
  require '../Depends.pm';
***************
*** 25,32 ****
  
  # documentation
  #gendefs::gen_doc('gdkimlib');
! system("../tools/gendoc.pl", "-t", 'gdkimlib', $imlib->get_xs);
! system("../tools/gpdoc2pod", "-t", 'GdkImlib');
  
  WriteMakefile(
        'NAME'      => 'Gtk::Gdk::ImlibImage',
--- 26,33 ----
  
  # documentation
  #gendefs::gen_doc('gdkimlib');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'gdkimlib', $imlib->get_xs);
! system($Config{perlpath}, "../tools/gpdoc2pod", "-t", 'GdkImlib');
  
  WriteMakefile(
        'NAME'      => 'Gtk::Gdk::ImlibImage',
Index: GdkPixbuf/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/GdkPixbuf/Makefile.PL,v
retrieving revision 1.8
diff -c -r1.8 Makefile.PL
*** GdkPixbuf/Makefile.PL       2001/03/12 21:29:42     1.8
--- GdkPixbuf/Makefile.PL       2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use blib '../Gtk';
  use Cwd;
  require '../Depends.pm';
***************
*** 53,60 ****
  
  # documentation
  gendefs::gen_doc('gdkpixbuf');
! system("../tools/gendoc.pl", "-t", 'gdkpixbuf', $gpb->get_xs);
! system("../tools/gpdoc2pod", "-t", 'GdkPixbuf');
  
  WriteMakefile(
        'NAME'      => 'Gtk::Gdk::Pixbuf',
--- 54,61 ----
  
  # documentation
  gendefs::gen_doc('gdkpixbuf');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'gdkpixbuf', $gpb->get_xs);
! system($Config{perlpath}, "../tools/gpdoc2pod", "-t", 'GdkPixbuf');
  
  WriteMakefile(
        'NAME'      => 'Gtk::Gdk::Pixbuf',
***************
*** 79,85 ****
        $(PERL) ../tools/genext.pl GdkPixbuf </dev/null
  
  gendoc:
!       ../tools/gendoc.pl -t gdkpixbuf $(XS_FILES)
  
  ';
  
--- 80,86 ----
        $(PERL) ../tools/genext.pl GdkPixbuf </dev/null
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl -t gdkpixbuf $(XS_FILES)
  
  ';
  
Index: Glade/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/Glade/Makefile.PL,v
retrieving revision 1.9
diff -c -r1.9 Makefile.PL
*** Glade/Makefile.PL   2001/03/11 14:39:48     1.9
--- Glade/Makefile.PL   2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use blib '../Gtk';
  use Cwd;
  require '../Depends.pm';
***************
*** 72,79 ****
  
  # documentation
  gendefs::gen_doc('glade');
! system("../tools/gendoc.pl", "-t", 'glade', $glade->get_xs);
! system("../tools/gpdoc2pod", "-t", 'Glade');
  
  WriteMakefile(
        'NAME'      => 'Gtk::GladeXML',
--- 73,80 ----
  
  # documentation
  gendefs::gen_doc('glade');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'glade', $glade->get_xs);
! system($Config{perlpath}, "../tools/gpdoc2pod", "-t", 'Glade');
  
  WriteMakefile(
        'NAME'      => 'Gtk::GladeXML',
***************
*** 98,104 ****
        $(PERL) ../tools/genext.pl GtkGladeXML </dev/null
  
  gendoc:
!       ../tools/gendoc.pl -t glade $(XS_FILES)
  
  ';
  
--- 99,105 ----
        $(PERL) ../tools/genext.pl GtkGladeXML </dev/null
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl -t glade $(XS_FILES)
  
  ';
  
Index: Gnome/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/Gnome/Makefile.PL,v
retrieving revision 1.18
diff -c -r1.18 Makefile.PL
*** Gnome/Makefile.PL   2001/03/21 12:22:24     1.18
--- Gnome/Makefile.PL   2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use blib '../Gtk';
  use blib '../GdkImlib';
  use Cwd;
***************
*** 83,90 ****
  
  # documentation
  gendefs::gen_doc('gnome');
! system("../tools/gendoc.pl", "-t", 'gnome', $gnome->get_xs);
! system("../tools/gpdoc2pod", "-t", 'Gnome');
  
  WriteMakefile(
        'NAME'      => 'Gnome',
--- 84,91 ----
  
  # documentation
  gendefs::gen_doc('gnome');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'gnome', $gnome->get_xs);
! system($Config{perlpath}, "../tools/gpdoc2pod", "-t", 'Gnome');
  
  WriteMakefile(
        'NAME'      => 'Gnome',
***************
*** 113,119 ****
        $(PERL) ../tools/genext.pl Gnome </dev/null
  
  gendoc:
!       ../tools/gendoc.pl -t gnome $(XS_FILES)
  
  ';
  
--- 114,120 ----
        $(PERL) ../tools/genext.pl Gnome </dev/null
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl -t gnome $(XS_FILES)
  
  ';
  
Index: GnomePrint/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/GnomePrint/Makefile.PL,v
retrieving revision 1.8
diff -c -r1.8 Makefile.PL
*** GnomePrint/Makefile.PL      2001/03/21 12:22:25     1.8
--- GnomePrint/Makefile.PL      2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use File::Basename;
  use blib '..';
  use blib '../Gnome';
***************
*** 75,82 ****
  
  # documentation
  gendefs::gen_doc('gnomeprint');
! system("../tools/gendoc.pl", "-t", 'gnomeprint', $gp->get_xs);
! system("../tools/gpdoc2pod", "-t", 'Gnome::Print');
  
  WriteMakefile(
        'NAME'      => 'Gnome::Print',
--- 76,83 ----
  
  # documentation
  gendefs::gen_doc('gnomeprint');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'gnomeprint', $gp->get_xs);
! system($Config{perlpath}, "../tools/gpdoc2pod", "-t", 'Gnome::Print');
  
  WriteMakefile(
        'NAME'      => 'Gnome::Print',
***************
*** 102,108 ****
        $(PERL) ../tools/genext.pl GnomePrint </dev/null
  
  gendoc:
!       ../tools/gendoc.pl -t gnomeprint $(XS_FILES)
  
  ';
  
--- 103,109 ----
        $(PERL) ../tools/genext.pl GnomePrint </dev/null
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl -t gnomeprint $(XS_FILES)
  
  ';
  
Index: Gtk/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/Gtk/Makefile.PL,v
retrieving revision 1.15
diff -c -r1.15 Makefile.PL
*** Gtk/Makefile.PL     2001/03/21 11:00:42     1.15
--- Gtk/Makefile.PL     2001/03/22 21:26:05
***************
*** 132,139 ****
  
  # documentation
  gendefs::gen_doc();
! system("../tools/gendoc.pl", $gtk->get_xs);
! system("../tools/gpdoc2pod");
  
  use File::Basename;
  
--- 132,139 ----
  
  # documentation
  gendefs::gen_doc();
! system($Config{perlpath}, "../tools/gendoc.pl", $gtk->get_xs);
! system($Config{perlpath}, "../tools/gpdoc2pod");
  
  use File::Basename;
  
***************
*** 180,186 ****
        $(PERL) ../tools/genext.pl Gtk
  
  gendoc:
!       ../tools/gendoc.pl $(XS_FILES)
  
  ';
  
--- 180,186 ----
        $(PERL) ../tools/genext.pl Gtk
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl $(XS_FILES)
  
  ';
  
Index: GtkGLArea/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/GtkGLArea/Makefile.PL,v
retrieving revision 1.7
diff -c -r1.7 Makefile.PL
*** GtkGLArea/Makefile.PL       2001/02/19 18:00:32     1.7
--- GtkGLArea/Makefile.PL       2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use blib '../Gtk';
  use Cwd;
  require '../Depends.pm';
***************
*** 68,74 ****
  
  # documentation
  gendefs::gen_doc('gtkglarea');
! system("../tools/gendoc.pl", "-t", 'gtkglarea', $gl->get_xs);
  
  WriteMakefile(
        'NAME'      => 'Gtk::GLArea',
--- 69,75 ----
  
  # documentation
  gendefs::gen_doc('gtkglarea');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'gtkglarea', $gl->get_xs);
  
  WriteMakefile(
        'NAME'      => 'Gtk::GLArea',
***************
*** 92,98 ****
        $(PERL) ../tools/genext.pl GtkGLArea </dev/null
  
  gendoc:
!       ../tools/gendoc.pl -t gtkglarea $(XS_FILES)
  
  ';
  
--- 93,99 ----
        $(PERL) ../tools/genext.pl GtkGLArea </dev/null
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl -t gtkglarea $(XS_FILES)
  
  ';
  
Index: GtkHTML/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/GtkHTML/Makefile.PL,v
retrieving revision 1.11
diff -c -r1.11 Makefile.PL
*** GtkHTML/Makefile.PL 2001/03/11 14:39:50     1.11
--- GtkHTML/Makefile.PL 2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use Cwd;
  use blib '..';
  require '../Depends.pm';
***************
*** 69,76 ****
  
  # documentation
  gendefs::gen_doc('gtkhtml');
! system("../tools/gendoc.pl", "-t", 'gtkhtml', $html->get_xs);
! system("../tools/gpdoc2pod", "-t", 'GtkHTML');
  
  $html->write_ext("build/extension.xsh");
  
--- 70,77 ----
  
  # documentation
  gendefs::gen_doc('gtkhtml');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'gtkhtml', $html->get_xs);
! system($Config{perlpath}, "../tools/gpdoc2pod", "-t", 'GtkHTML');
  
  $html->write_ext("build/extension.xsh");
  
***************
*** 98,104 ****
        $(PERL) ../tools/genext.pl GtkHTML </dev/null
  
  gendoc:
!       ../tools/gendoc.pl -t gtkhtml $(XS_FILES)
  
  ';
  }
--- 99,105 ----
        $(PERL) ../tools/genext.pl GtkHTML </dev/null
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl -t gtkhtml $(XS_FILES)
  
  ';
  }
Index: GtkXmHTML/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/GtkXmHTML/Makefile.PL,v
retrieving revision 1.8
diff -c -r1.8 Makefile.PL
*** GtkXmHTML/Makefile.PL       2001/02/26 18:31:09     1.8
--- GtkXmHTML/Makefile.PL       2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use File::Basename;
  use blib '..';
  use Cwd;
***************
*** 63,69 ****
  
  # documentation
  gendefs::gen_doc('gtkxmhtml');
! system("../tools/gendoc.pl", "-t", 'gtkxmhtml', $xm->get_xs);
  
  WriteMakefile(
        'NAME'      => 'Gtk::XmHTML',
--- 64,70 ----
  
  # documentation
  gendefs::gen_doc('gtkxmhtml');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'gtkxmhtml', $xm->get_xs);
  
  WriteMakefile(
        'NAME'      => 'Gtk::XmHTML',
***************
*** 85,91 ****
        $(PERL) ../tools/genext.pl GtkXmHTML </dev/null
  
  gendoc:
!       ../tools/gendoc.pl -t gtkxmhtml $(XS_FILES)
  
  ';
  
--- 86,92 ----
        $(PERL) ../tools/genext.pl GtkXmHTML </dev/null
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl -t gtkxmhtml $(XS_FILES)
  
  ';
  
Index: Mozilla/Makefile.PL
===================================================================
RCS file: /cvs/gnome/gnome-perl/Mozilla/Makefile.PL,v
retrieving revision 1.3
diff -c -r1.3 Makefile.PL
*** Mozilla/Makefile.PL 2001/02/19 18:00:33     1.3
--- Mozilla/Makefile.PL 2001/03/22 21:26:05
***************
*** 1,4 ****
--- 1,5 ----
  use ExtUtils::MakeMaker;
+ use Config;
  use Cwd;
  use blib '..';
  require '../Depends.pm';
***************
*** 60,66 ****
  
  # documentation
  gendefs::gen_doc('gtkmozembed');
! system("../tools/gendoc.pl", "-t", 'gtkmozembed', $moz->get_xs);
  
  $moz->write_ext("build/extension.xsh");
  
--- 61,67 ----
  
  # documentation
  gendefs::gen_doc('gtkmozembed');
! system($Config{perlpath}, "../tools/gendoc.pl", "-t", 'gtkmozembed', $moz->get_xs);
  
  $moz->write_ext("build/extension.xsh");
  
***************
*** 85,91 ****
        $(PERL) ../tools/genext.pl GtkMozEmbed </dev/null
  
  gendoc:
!       ../tools/gendoc.pl -t gtkmozembed $(XS_FILES)
  
  ';
  }
--- 86,92 ----
        $(PERL) ../tools/genext.pl GtkMozEmbed </dev/null
  
  gendoc:
!       $(PERL) ../tools/gendoc.pl -t gtkmozembed $(XS_FILES)
  
  ';
  }
Index: tools/gpdoc2pod
===================================================================
RCS file: /cvs/gnome/gnome-perl/tools/gpdoc2pod,v
retrieving revision 1.2
diff -c -r1.2 gpdoc2pod
*** tools/gpdoc2pod     2001/03/19 09:38:22     1.2
--- tools/gpdoc2pod     2001/03/22 21:26:05
***************
*** 1,4 ****
! #!/usr/bin/perl -w
  
  use XML::Parser;
  use Getopt::Std;
--- 1,4 ----
! #!/opt/perl5.6.0/bin/perl -w
  
  use XML::Parser;
  use Getopt::Std;

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]