From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 13 Jun 2008 22:45:39 +0000 (+0000)
Subject: xterm should not be in /bin
X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=f282c2fc77e57ed6b368fe7e5a8a33196524de28;p=packages.git

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 bff83af57..356e3e220 100644
--- 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 946bed321..dfc0c323a 100644
--- 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