From af6bcc131b2415ea74f4564bba6471ec6b6c2652 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 13 Mar 2010 22:21:10 +0100 Subject: [PATCH] xorg-server: - cosmetics --- packages/x11/xserver/xorg-server/install | 44 +++++++++++------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index a510cb56b4..d94cc20f28 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -23,42 +23,42 @@ XORG_DST="$INSTALL/$XORG_PATH_MODULES" PKG_DIR=`find $PACKAGES -type d -name $1` mkdir -p $INSTALL/usr/bin - cp $XORG_SRC/Xorg $INSTALL/usr/bin + cp -P $XORG_SRC/Xorg $INSTALL/usr/bin mkdir -p $XORG_DST - cp $XORG_SRC/exa/.libs/libexa.so $XORG_DST - cp $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST - cp $XORG_SRC/int10/.libs/libint10.so $XORG_DST - cp $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST - cp $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST - cp $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST - cp $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST - cp $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST - cp $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST - cp $XORG_SRC/xf8_16bpp/.libs/libxf8_16bpp.so $XORG_DST + cp -P $XORG_SRC/exa/.libs/libexa.so $XORG_DST + cp -P $XORG_SRC/dixmods/.libs/libfb.so $XORG_DST + cp -P $XORG_SRC/int10/.libs/libint10.so $XORG_DST + cp -P $XORG_SRC/dixmods/.libs/libshadow.so $XORG_DST + cp -P $XORG_SRC/shadowfb/.libs/libshadowfb.so $XORG_DST + cp -P $XORG_SRC/vbe/.libs/libvbe.so $XORG_DST + cp -P $XORG_SRC/vgahw/.libs/libvgahw.so $XORG_DST + cp -P $XORG_SRC/dixmods/.libs/libwfb.so $XORG_DST + cp -P $XORG_SRC/xaa/.libs/libxaa.so $XORG_DST + cp -P $XORG_SRC/xf8_16bpp/.libs/libxf8_16bpp.so $XORG_DST mkdir -p $XORG_DST/extensions - cp $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions - cp $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions - cp $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions - cp $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions - cp $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers + cp -P $XORG_SRC/dixmods/.libs/libdbe.so $XORG_DST/extensions + cp -P $XORG_SRC/dri/.libs/libdri.so $XORG_DST/extensions + cp -P $XORG_SRC/dri2/.libs/libdri2.so $XORG_DST/extensions + cp -P $XORG_SRC/dixmods/extmod/.libs/libextmod.so $XORG_DST/extensions + cp -P $XORG_SRC/dixmods/.libs/libglx.so $XORG_DST/extensions/libglx_mesa.so # rename for cooperate with nvidia drivers ln -sf /var/lib/libglx.so $XORG_DST/extensions/libglx.so mkdir -p $XORG_DST/linux - cp $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST/linux + cp -P $XORG_SRC/fbdevhw/.libs/libfbdevhw.so $XORG_DST/linux mkdir -p $XORG_DST/multimedia - cp $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia + cp -P $XORG_SRC/i2c/.libs/*_drv.so $XORG_DST/multimedia mkdir -p $INSTALL/usr/lib/xorg - cp $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xorg + cp -P $PKG_BUILD/dix/protocol.txt $INSTALL/usr/lib/xorg mkdir -p $INSTALL/etc/dbus-1/system.d - cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d + cp -P $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ - cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi + cp -P $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi #Fonts $SCRIPTS/install encodings @@ -76,8 +76,6 @@ mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/ $SCRIPTS/install xf86-input-synaptics $SCRIPTS/install xf86-input-wacom -get_graphicdrivers - for drv in $XORG_DRIVERS; do $SCRIPTS/install xf86-video-$drv done