diff options
| author | Antoine Ginies <aginies@mandriva.com> | 2011-03-08 14:14:13 +0000 |
|---|---|---|
| committer | Antoine Ginies <aginies@mandriva.com> | 2011-03-08 14:14:13 +0000 |
| commit | ad6cd8ff647086b26e0bbe9aed9bba083e9ac40b (patch) | |
| tree | 0b56eb43ce1ba210397b199827abec666bfedf8a | |
| parent | 9b69b921952596c8c8f275fcbc010f9e5b3e46cc (diff) | |
| download | drakx-ad6cd8ff647086b26e0bbe9aed9bba083e9ac40b.tar drakx-ad6cd8ff647086b26e0bbe9aed9bba083e9ac40b.tar.gz drakx-ad6cd8ff647086b26e0bbe9aed9bba083e9ac40b.tar.bz2 drakx-ad6cd8ff647086b26e0bbe9aed9bba083e9ac40b.tar.xz drakx-ad6cd8ff647086b26e0bbe9aed9bba083e9ac40b.zip | |
disable pcmcia
| -rw-r--r-- | mdk-stage1/Makefile | 6 | ||||
| -rw-r--r-- | perl-install/c/Makefile.PL | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 59a5fdbba..267039f9e 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -49,7 +49,7 @@ top_dir = . include $(top_dir)/Makefile.common include $(top_dir)/../Makefile.config ARCHDIR=$(ARCH) -ifeq (i386, $(ARCH)) +iefeq (i386, $(ARCH)) ARCHDIR=i586 endif @@ -136,11 +136,11 @@ endif ifeq (i386,$(ARCH)) PCMCIA_LIB = pcmcia/libpcmcia.a sysfs/libsysfs.a -PCMCIA_DEFS = -DENABLE_PCMCIA +PCMCIA_DEFS = endif ifeq (x86_64,$(ARCH)) PCMCIA_LIB = pcmcia/libpcmcia.a sysfs/libsysfs.a -PCMCIA_DEFS = -DENABLE_PCMCIA +PCMCIA_DEFS = endif diff --git a/perl-install/c/Makefile.PL b/perl-install/c/Makefile.PL index 43c0d5587..ea99f60bb 100644 --- a/perl-install/c/Makefile.PL +++ b/perl-install/c/Makefile.PL @@ -9,7 +9,7 @@ my $lib = arch() =~ /x86_64/ ? 'lib64' : 'lib'; my $libs = '-lldetect -lparted'; #my $pcmcia_probe_o = "/usr/$lib/drakx-installer-binaries/pcmcia_probe.o"; -my $pcmcia_probe_o = "../../mdk-stage1/pcmcia/pcmcia_probe.o"; +#my $pcmcia_probe_o = "../../mdk-stage1/pcmcia/pcmcia_probe.o"; WriteMakefile( 'NAME' => 'stuff', |