diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-05-06 02:43:04 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-05-06 02:43:04 +0000 |
| commit | 4e506c9aefe5b89970ae6894d05ad53c81af0d83 (patch) | |
| tree | 2fac98df209e72eaba773cad2d7b90c99d9d9249 /mdk-stage1/Makefile | |
| parent | 793707b39bf2e9df40a6d2d60b83b3061088ae9e (diff) | |
| download | drakx-4e506c9aefe5b89970ae6894d05ad53c81af0d83.tar drakx-4e506c9aefe5b89970ae6894d05ad53c81af0d83.tar.gz drakx-4e506c9aefe5b89970ae6894d05ad53c81af0d83.tar.bz2 drakx-4e506c9aefe5b89970ae6894d05ad53c81af0d83.tar.xz drakx-4e506c9aefe5b89970ae6894d05ad53c81af0d83.zip | |
use installed dietlibc, not our forked cvs version
Diffstat (limited to 'mdk-stage1/Makefile')
| -rw-r--r-- | mdk-stage1/Makefile | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 3caf6989b..007d20043 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -104,7 +104,7 @@ STAGE1_OWN_LIBS = $(INSMOD)/libinsmod.a mar/libmar.a bzlib/libbzlib.a ifeq (DIETLIBC, $(L)) -STAGE1_NETWORK_LIBS = $(top_dir)/dietlibc/bin-$(ARCH)/librpc.a +STAGE1_NETWORK_LIBS = /usr/$(LIB)/dietlibc/bin-$(ARCH)/librpc.a else STAGE1_NETWORK_LIBS = /usr/$(LIB)/libresolv.a endif @@ -149,15 +149,6 @@ BINS += stage1-cdrom stage1-network endif endif -ifeq (i386, $(ARCH)) -DIRS = dietlibc -endif -ifeq (ppc, $(ARCH)) -DIRS = dietlibc -endif -ifeq (x86_64, $(ARCH)) -DIRS = dietlibc -endif DIRS += mar pci-resource usb-resource bzlib $(INSMOD) slang newt ppp/pppd rp-pppoe/src ifeq (i386, $(ARCH)) DIRS += pcmcia_ @@ -246,7 +237,7 @@ localclean: tar-mkinitrd_helper: clean rm -rf mkinitrd_helper-subdir mkdir mkinitrd_helper-subdir - cd mkinitrd_helper-subdir ; cp -a ../dietlibc ../insmod-busybox ../Makefile.common ../insmod.h ../log.h . ; \ + cd mkinitrd_helper-subdir ; cp -a ../insmod-busybox ../Makefile.common ../insmod.h ../log.h . ; \ cp ../Makefile.mkinitrd_helper Makefile tar cfj mkinitrd_helper.tar.bz2 mkinitrd_helper-subdir --exclude CVS rm -rf mkinitrd_helper-subdir |