xterm should not be in /bin

git-svn-id: svn://svn.openwrt.org/openwrt/packages@11464 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/XOrg/app/xterm-233/Makefile b/XOrg/app/xterm-233/Makefile
index bff83af..356e3e2 100644 (file)
--- a/XOrg/app/xterm-233/Makefile
+++ b/XOrg/app/xterm-233/Makefile
@@ -44,8 +44,8 @@ endef
 
 define Package/xterm/install
        $(INSTALL_DIR) $(1)/usr/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin $(1)/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin $(1)/usr/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/
 endef
 
 $(eval $(call BuildPackage,xterm))

diff --git a/XOrg/meta/xorg-server-essentials/files/xinitrc b/XOrg/meta/xorg-server-essentials/files/xinitrc
index 946bed3..dfc0c32 100644 (file)
--- a/XOrg/meta/xorg-server-essentials/files/xinitrc
+++ b/XOrg/meta/xorg-server-essentials/files/xinitrc
@@ -16,5 +16,5 @@ elif [ -x /usr/bin/matchbox-window-manager ]; then
 fi
 
 #starting shell
-/bin/xterm
+/usr/bin/xterm