From 393b6334a987bc86ecfe102068f309b894fad7c4 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 2 Apr 2001 20:59:13 +0000 Subject: don't use pcmcia_probe.o from stage1, better compile it here, otherwise perl-install require mdk-stage1 to do compiled => circular dependency --- perl-install/c/Makefile.PL | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL index d02ed2659..a403ddb24 100644 --- a/perl-install/c/Makefile.PL +++ b/perl-install/c/Makefile.PL @@ -9,13 +9,15 @@ $libs .= ' -lrpm -lrpmio -lz' if $ENV{C_RPM}; my $pcmcia_dir = $ENV{C_DRAKX} && $Config{archname} =~ /i.86/ ? '../../mdk-stage1/pcmcia' : ''; +symlink "$pcmcia_dir/pcmcia_probe.c", "pcmcia_probe.c"; + WriteMakefile( 'NAME' => 'stuff', 'OPTIMIZE' => '-Os', 'MAKEFILE' => 'Makefile_c', - 'OBJECT' => "stuff.o smp.o sbus.o silo.o " . ($pcmcia_dir && "$pcmcia_dir/pcmcia_probe.o"), + 'OBJECT' => "stuff.o smp.o sbus.o silo.o" . ($pcmcia_dir && " pcmcia_probe.o"), 'VERSION_FROM' => 'stuff.pm', # finds $VERSION 'LIBS' => [$libs], # e.g., '-lm' 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' - 'INC' => "-I/usr/include/rpm `gtk-config --cflags` `glib-config --cflags`" . ($pcmcia_dir && " -I$pcmcia_dir"), + 'INC' => "-I/usr/include/rpm `gtk-config --cflags` `glib-config --cflags`" . ($pcmcia_dir && " -I$pcmcia_dir -I$pcmcia_dir/.."), ); -- cgit v1.2.1