The Big Commit. Modifies apps to install into /usr instead of /usr/X11R6. If it breaks, fix it.

2 files changed, 3 insertions, 6 deletions

diff --git a/net-www/skipstone/files/digest-skipstone-0.7.5 b/net-www/skipstone/files/digest-skipstone-0.7.5
deleted file mode 100644
index db9795d1521c..000000000000
--- a/net-www/skipstone/files/digest-skipstone-0.7.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f7864391e09779f1719663fcd99b4ea1 skipstone-0.7.5.tar.gz
diff --git a/net-www/skipstone/skipstone-0.7.5.ebuild b/net-www/skipstone/skipstone-0.7.5-r1.ebuild
index 1611013fce56..00f5b9d7ea2a 100644
--- a/net-www/skipstone/skipstone-0.7.5.ebuild
+++ b/net-www/skipstone/skipstone-0.7.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Damon Conway <damon@3jane.net> 
-# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/skipstone-0.7.5.ebuild,v 1.1 2001/09/14 05:30:16 lordjoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/skipstone/skipstone-0.7.5-r1.ebuild,v 1.1 2001/10/06 15:30:16 danarmak Exp $
 
 A=${P}.tar.gz
 S=${WORKDIR}/${P}
@@ -18,12 +18,10 @@ src_compile() {
  	myconf="enable_nls=1"
     fi
     cd ${S}/src
-    mv skipstone.h skipstone.h.bak
-    sed skipstone.h.bak -e "s:/usr/share:/usr/X11R6/share:" > skipstone.h
-    make $myconf PREFIX="/usr/X11R6" MOZILLA_INCLUDES="-I${MOZILLA_FIVE_HOME}/include -I${MOZILLA_FIVE_HOME}/include/nspr" MOZILLA_LIBS="-L${MOZILLA_FIVE_HOME} -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom" || die
+    make $myconf PREFIX="/usr" MOZILLA_INCLUDES="-I${MOZILLA_FIVE_HOME}/include -I${MOZILLA_FIVE_HOME}/include/nspr" MOZILLA_LIBS="-L${MOZILLA_FIVE_HOME} -lgtkembedmoz -lplds4 -lplc4 -lnspr4 -lgtksuperwin -lxpcom" || die
 }
 
 src_install () {
-    make PREFIX=${D}/usr/X11R6 install || die
+    make PREFIX=${D}/usr install || die
     dodoc AUTHORS COPYING README README.copying 
 }