diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-05-20 05:40:00 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-05-20 05:40:00 +0000 |
| commit | ba595445ed4eee7a23374140b9fbb5d907fef381 (patch) | |
| tree | ab5c0aa488ad1323abe53b359823d44a3711910f /perl-install/Makefile | |
| parent | b75a57269de5acd7b0b53a82e0846f4423f7b142 (diff) | |
| download | drakx-ba595445ed4eee7a23374140b9fbb5d907fef381.tar drakx-ba595445ed4eee7a23374140b9fbb5d907fef381.tar.gz drakx-ba595445ed4eee7a23374140b9fbb5d907fef381.tar.bz2 drakx-ba595445ed4eee7a23374140b9fbb5d907fef381.tar.xz drakx-ba595445ed4eee7a23374140b9fbb5d907fef381.zip | |
keep binaries in their "standard" binary dir instead of moving everything to /usr/bin
(it used to be in /usr/bin when the stage1 was not exited)
Diffstat (limited to 'perl-install/Makefile')
| -rw-r--r-- | perl-install/Makefile | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/Makefile b/perl-install/Makefile index 0834fc250..e4c7b87d3 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -100,9 +100,7 @@ mo_files : $(MOFILES) get_needed_files: $(DIRS) mo_files REP4PMS=$(REP4PMS) ../tools/install-xml-file-list share/list.xml $(DEST) - mv -f $(DEST)/{bin,sbin}/* $(DEST)/usr/bin mv -f $(DEST)/usr/{lib,X11R6/lib}/*.so* $(DEST)/lib - rmdir $(DEST)/{bin,sbin} ../tools/simplify-drakx-modules $(DEST)/usr/*/*/*/utf8_heavy.pl cp -f $(STAGE1)/init-stage2 $(DEST)/etc/init @@ -111,11 +109,11 @@ get_needed_files: $(DIRS) mo_files perl -I. -Mlang -e 'symlink "UTF-8", "$(DEST)/usr/share/locale/$$_" foreach lang::list_langs()' - perl -ane 'symlink "$$F[1]", "$(DEST)/usr/bin/$$F[0]"' share/aliases + perl -ane 'symlink "$$F[1]", "$(DEST)$$F[0]"' share/aliases ifeq (ia64,$(ARCH)) - ln -sf bash $(DEST)/usr/bin/sh + ln -sf bash $(DEST)/bin/sh else - ln -sf ash $(DEST)/usr/bin/sh + ln -sf ash $(DEST)/bin/sh endif mkfontdir $(DEST)/usr/X11R6/lib/X11/fonts @@ -131,7 +129,7 @@ endif rm -rf $(DEST)/usr/share/locale_special/{be,fur,ta} ifeq (y,$(USE_PCMCIA)) - install -s /sbin/cardmgr $(DEST)/usr/bin + install -s /sbin/cardmgr $(DEST)/sbin cp -a /etc/pcmcia $(DEST)/etc ../tools/patch_pcmcia_config.pl $(DEST)/etc/pcmcia/config ../kernel/all.kernels/`cat ../kernel/all.kernels/.main`/modules.dep endif |