diff options
| author | Mystery Man <unknown@mandriva.org> | 2003-11-21 12:53:39 +0000 |
|---|---|---|
| committer | Mystery Man <unknown@mandriva.org> | 2003-11-21 12:53:39 +0000 |
| commit | 7396369ef190a049b3a779a54edd76ff118f3c28 (patch) | |
| tree | 20c2a6d7fcd96433d0d91b1460b5604a6d7267ce /perl-install/Makefile | |
| parent | e41742b093fdb26bcae87e9d5b30d4d7bca93ea9 (diff) | |
| download | drakx-MDK92-AMD64.tar drakx-MDK92-AMD64.tar.gz drakx-MDK92-AMD64.tar.bz2 drakx-MDK92-AMD64.tar.xz drakx-MDK92-AMD64.zip | |
This commit was manufactured by cvs2svn to create tag 'MDK92-AMD64'.MDK92-AMD64
Diffstat (limited to 'perl-install/Makefile')
| -rw-r--r-- | perl-install/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index d8b9d4d65..1d9e64e30 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -12,6 +12,14 @@ OTHERS = $(OTHERDIRS) $(OTHERFILES) OTHERDIRS = tools/ddcprobe tools/serial_probe OTHERFILES = tools/rpcinfo-flushed.c +USE_PCMCIA := n +ifeq ($(ARCH),i386) +USE_PCMCIA := y +endif +ifeq ($(ARCH),x86_64) +USE_PCMCIA := y +endif + .PHONY: all $(DIRS) install clean stage2 full_stage2 all: list_modules.pm TAGS $(DIRS) @@ -180,6 +188,7 @@ endif clean-rpmsrate $(ROOTDEST)/Mandrake/base/rpmsrate $(ROOTDEST)/Mandrake/RPMS* for i in ../kernel/modules.description ../kernel/all.modules/modules.cz*; do cp -f $$i $(DEST)/lib/; done + rm -f $(DEST)/lib/modules.cz-cdcom.* $(MAKE) -C share/po install NAME=libDrakX LOCALEDIR=$(DEST)/usr/share/locale_special @@ -190,7 +199,7 @@ endif # echo -e '#!/bin/sh\n\nexec "/usr/bin/sh"' > $(DEST)/usr/bin/runinstall2 # chmod a+x $(DEST)/usr/bin/runinstall2 -ifeq (i386,$(ARCH)) +ifeq (y,$(USE_PCMCIA)) cp -a /etc/pcmcia $(DEST)/etc ../tools/patch_pcmcia_config.pl $(DEST)/etc/pcmcia/config ../kernel/all.modules/`cat ../kernel/all.kernels/.main`/modules.dep endif |