diff options
| author | Makoto Matsushita <matusita@FreeBSD.org> | 2007-06-01 01:59:46 +0000 |
|---|---|---|
| committer | Makoto Matsushita <matusita@FreeBSD.org> | 2007-06-01 01:59:46 +0000 |
| commit | dad2c0e87c6c187390d607426396e9f3c1942747 (patch) | |
| tree | b9defb83f697ee07f5017d549b80dcab4b4b009f /emulators/vmware-guestd6 | |
| parent | Fix typo that prevented additional dependencies when COMPLETE_BUILD and/or (diff) | |
Change X server modules installation directory to a new place for X.Org 7.2.
Bump PORTREVISION for vmware-tools6 only.
Notes
Notes:
svn path=/head/; revision=192502
Diffstat (limited to 'emulators/vmware-guestd6')
| -rw-r--r-- | emulators/vmware-guestd6/Makefile | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile index 881eda1b71b2..659f687a702b 100644 --- a/emulators/vmware-guestd6/Makefile +++ b/emulators/vmware-guestd6/Makefile @@ -82,8 +82,10 @@ OSSFX?= -6 .if ${X_WINDOW_SYSTEM:L} == xfree86-4 PLIST_SUB+= INSTALLXSERVER4="" +VMWARE_XMODDIR= ${X11BASE}/lib/modules .else PLIST_SUB+= INSTALLXSERVER4="@comment " +VMWARE_XMODDIR= ${X11BASE}/lib/xorg/modules .endif .else @@ -194,28 +196,28 @@ do-install: .if defined(WITH_VMWARE_GTK) ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}${OSSFX}/vmware-toolbox-gtk ${X11BASE}/bin .endif - if [ ! -d ${X11BASE}/lib/modules/input ] ; then \ - ${MKDIR} ${X11BASE}/lib/modules/input ; \ + if [ ! -d ${VMWARE_XMODDIR}/input ] ; then \ + ${MKDIR} ${VMWARE_XMODDIR}/input ; \ fi - if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \ - ${MKDIR} ${X11BASE}/lib/modules/drivers ; \ + if [ ! -d ${VMWARE_XMODDIR}/drivers ] ; then \ + ${MKDIR} ${VMWARE_XMODDIR}/drivers ; \ fi .if ${X_WINDOW_SYSTEM:L} == xfree86-4 ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware .if ${BITS} == 32 - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${VMWARE_XMODDIR}/drivers/vmware_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${VMWARE_XMODDIR}/input/vmmouse_drv.o_VMware .else - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmware_drv.o ${VMWARE_XMODDIR}/drivers/vmware_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x_64/vmmouse_drv.o ${VMWARE_XMODDIR}/input/vmmouse_drv.o_VMware .endif .else .if ${BITS} == 32 - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmware_drv.o ${VMWARE_XMODDIR}/drivers/vmware_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${VMWARE_XMODDIR}/input/vmmouse_drv.o_VMware .else - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmware_drv.o ${VMWARE_XMODDIR}/drivers/vmware_drv.o_VMware + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x_64/vmmouse_drv.o ${VMWARE_XMODDIR}/input/vmmouse_drv.o_VMware .endif .endif -${WRKSRC}/lib/sbin${BITS}${OSSFX}/vmware-guestd --cmd toolinstall.end 2>&1 |