diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2001-04-02 20:59:13 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2001-04-02 20:59:13 +0000 |
commit | 393b6334a987bc86ecfe102068f309b894fad7c4 (patch) | |
tree | 61ed51ce3e64ad6963efbc923d635975d00cba41 | |
parent | d26ce8a96ce695caeecec5a895156266f402ff30 (diff) | |
download | drakx-393b6334a987bc86ecfe102068f309b894fad7c4.tar drakx-393b6334a987bc86ecfe102068f309b894fad7c4.tar.gz drakx-393b6334a987bc86ecfe102068f309b894fad7c4.tar.bz2 drakx-393b6334a987bc86ecfe102068f309b894fad7c4.tar.xz drakx-393b6334a987bc86ecfe102068f309b894fad7c4.zip |
don't use pcmcia_probe.o from stage1, better compile it here, otherwise
perl-install require mdk-stage1 to do compiled => circular dependency
-rw-r--r-- | perl-install/c/Makefile.PL | 6 |
1 files changed, 4 insertions, 2 deletions
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/.."), ); |