summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2001-07-27 13:06:20 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2001-07-27 13:06:20 +0000
commitb60292174096b8dfee12420feef27bb2bb342da1 (patch)
treeb95ddbbd04fbf24afdbc95e8f2feaaec92632b3e /Makefile
parent69ef6fc24e26ec053d86c8f080822408a225d929 (diff)
downloaddrakx-backup-do-not-use-b60292174096b8dfee12420feef27bb2bb342da1.tar
drakx-backup-do-not-use-b60292174096b8dfee12420feef27bb2bb342da1.tar.gz
drakx-backup-do-not-use-b60292174096b8dfee12420feef27bb2bb342da1.tar.bz2
drakx-backup-do-not-use-b60292174096b8dfee12420feef27bb2bb342da1.tar.xz
drakx-backup-do-not-use-b60292174096b8dfee12420feef27bb2bb342da1.zip
- Makefile (ia64): RELEASE_BOOT_IMG is all.img
- make_boot_img (initrd): ia64: increased image to 16 MB, don't try to copy /etc/pcmcia since we don't have it
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 153c8ddc9..3aae7a662 100644
--- a/Makefile
+++ b/Makefile
@@ -13,6 +13,10 @@ ifeq (ppc,$(ARCH))
BOOT_IMG =
RELEASE_BOOT_IMG = all.img
endif
+ifeq (ia64,$(ARCH))
+BOOT_IMG =
+RELEASE_BOOT_IMG = all.img
+endif
BOOT_IMG += $(RELEASE_BOOT_IMG)
FRELEASE_BOOT_IMG = $(BOOT_IMG:%=images/%)
pm" > /tmp/list ' $(PERL) -d install2 < /dev/null
- cp -f list /tmp/list
- perl -pi -e "s/ARCH/$(ARCH)/" /tmp/list
+ cp -f `../tools/specific_arch list` /tmp/list
+# cp -f list /tmp/list
+# perl -pi -e "s/ARCH/$(ARCH)/" /tmp/list
find auto -follow -name "*.so" >> /tmp/list
for i in $(LOCALFILES) `cat /tmp/list` ; do \
@@ -75,6 +76,13 @@ get_needed_files: $(DIRS)
install -d $(ROOTDEST)/Mandrake/base
install -s $(LOCALFILES) $(DEST)/usr/bin
# cp -f $(LOCALFILES2) $(DEST)/usr/bin
+ifeq (sparc,$(ARCH))
+ cp -a /usr/X11R6/lib/X11/xkb $(DEST)/usr/X11R6/lib/X11
+ rm -f $(DEST)/usr/X11R6/lib/X11/xkb/compiled
+ ln -s /tmp $(DEST)/usr/X11R6/lib/X11/xkb/compiled
+ ln -s /usr/X11R6/lib/X11 $(DEST)/usr/lib/X11
+ ln -s /usr/X11R6/lib/X11/xkb/xkbcomp $(DEST)/usr/bin/xkbcomp
+endif
for i in `cat /tmp/list`; do \
if (echo $$i | grep -q "lib/[^/]*\.so"); then \
@@ -101,7 +109,7 @@ get_needed_files: $(DIRS)
perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' aliases
- tar xfy locales.tar.bz2 -C $(DEST)
+ tar xfy `../tools/specific_arch locales.tar.bz2` -C $(DEST)
# DEST=$(DEST) perl -I. -MForMakefile -e 'locale()'
# DEST=$(DEST) perl -I. -MForMakefile -e 'xmodmap()'
@@ -128,7 +136,7 @@ get_needed_files: $(DIRS)
tar xyC $(DEST) -f ../install/install1_pcmcia.tar.bz2 ./etc/pcmcia
full_stage2:
- sudo rm -rf $(DEST)
+ rm -rf $(DEST)
mkdir -p $(DEST)
$(MAKE) get_needed_files
$(MAKE) stage2