From d97a50a68669cda0b21f2e0f021f1e49dcf31d26 Mon Sep 17 00:00:00 2001 From: Martin Blapp Date: Wed, 16 Apr 2003 12:36:46 +0000 Subject: [PATCH] Use LINUXBASE where it is possible. Do not install into /etc directly. Submitted by: Munehiro Matsuda --- emulators/vmware3/Makefile | 6 +++--- emulators/vmware3/pkg-plist | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emulators/vmware3/Makefile b/emulators/vmware3/Makefile index 50a109036110..82e02fc60db0 100644 --- a/emulators/vmware3/Makefile +++ b/emulators/vmware3/Makefile @@ -203,9 +203,9 @@ pre-install: setoptions .endif post-install: - ${LN} -sf ${PREFIX}/etc/vmware /etc/ - @if [ ! -e /compat/linux/usr/lib/vmware/bin/vmware ]; then \ - ${LN} -sf ${PREFIX}/lib/vmware /compat/linux/usr/lib/vmware; \ + ${LN} -sf ${PREFIX}/etc/vmware ${LINUXBASE}/etc/ + @if [ ! -e ${LINUXBASE}/usr/lib/vmware/bin/vmware ]; then \ + ${LN} -sf ${PREFIX}/lib/vmware ${LINUXBASE}/usr/lib/vmware; \ fi @${CAT} ${PKGMESSAGE} diff --git a/emulators/vmware3/pkg-plist b/emulators/vmware3/pkg-plist index 9b164c85475f..963929f0bb8a 100644 --- a/emulators/vmware3/pkg-plist +++ b/emulators/vmware3/pkg-plist @@ -317,10 +317,10 @@ share/doc/vmware/README @exec chmod 666 %%LINUXBASE%%/dev/null @exec mknod %%LINUXBASE%%/dev/hda b 0 0x00010002 @exec mknod %%LINUXBASE%%/dev/hdb b 0 0x0001000a -@exec ln -sf %D/etc/vmware /etc/ +@exec ln -sf %D/etc/vmware %%LINUXBASE%%/etc/ @exec mknod %%LINUXBASE%%/dev/vmmon c 200 0 @exec mknod %%LINUXBASE%%/dev/vmnet1 c 149 %%VMNET1_MINOR%% -@unexec rm -f /etc/vmware %%LINUXBASE%%/dev/vmmon %%LINUXBASE%%/dev/vmnet1 %%LINUXBASE%%/bin/df %%LINUXBASE%%/dev/tty[0-9]* %%LINUXBASE%%/dev/hd? %%LINUXBASE%%/dev/null +@unexec rm -f %%LINUXBASE%%/etc/vmware %%LINUXBASE%%/dev/vmmon %%LINUXBASE%%/dev/vmnet1 %%LINUXBASE%%/bin/df %%LINUXBASE%%/dev/tty[0-9]* %%LINUXBASE%%/dev/hd? %%LINUXBASE%%/dev/null @dirrm etc/vmware @dirrm lib/vmware/bin @dirrm lib/vmware/lib/help