distcc: put the symlinks back in the build() function

5 files changed, 15 insertions, 58 deletions

diff --git a/distcc/.footprint b/distcc/.footprint
index 4139c744a..034bcfddb 100644
--- a/distcc/.footprint
+++ b/distcc/.footprint
@@ -6,6 +6,12 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/distcc
 -rwxr-xr-x	root/root	usr/bin/distccd
 -rwxr-xr-x	root/root	usr/bin/distccmon-text
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/distcc/
+lrwxrwxrwx	root/root	usr/lib/distcc/c++ -> ../../bin/distcc
+lrwxrwxrwx	root/root	usr/lib/distcc/cc -> ../../bin/distcc
+lrwxrwxrwx	root/root	usr/lib/distcc/g++ -> ../../bin/distcc
+lrwxrwxrwx	root/root	usr/lib/distcc/gcc -> ../../bin/distcc
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/distcc.1.gz
diff --git a/distcc/Pkgfile b/distcc/Pkgfile
index ddda9f416..7e10eefa5 100644
--- a/distcc/Pkgfile
+++ b/distcc/Pkgfile
@@ -6,13 +6,13 @@
 
 name=distcc
 version=2.18.3
-release=4
+release=5
 source=(http://distcc.samba.org/ftp/distcc/distcc-$version.tar.bz2 \
 	distcc-$version-install.patch distccd) 
 
 build() {
 	cd distcc-$version
-	patch -p 1 -i ../distcc-$version-install.patch
+	patch -p 1 -i $SRC/distcc-$version-install.patch
 
 	./configure \
 		--prefix=/usr \
@@ -23,5 +23,10 @@ build() {
 	make
 	make DESTDIR=$PKG install-man install-programs
 	install -m 0755 -D ../distccd $PKG/etc/rc.d/distccd
+
+	install -d $PKG/usr/lib/distcc
+	for c in cc c++ gcc g++; do
+		cd $PKG/usr/lib/distcc && ln -s ../../bin/distcc $c
+	done
 }
 
diff --git a/distcc/README b/distcc/README
index a7496d1e8..a8060b091 100644
--- a/distcc/README
+++ b/distcc/README
@@ -15,3 +15,5 @@ There's a service to simplify running distccd. By default, it uses allows connec
 DISTCC_ALLOW=192.168.1.0/24
 DISTCC_USER=otheruser
 ----
+
+There is more information on the public wiki http://crux.nu/Public/HomePage
diff --git a/distcc/post-install b/distcc/post-install
deleted file mode 100755
index 8775e8dea..000000000
--- a/distcc/post-install
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env sh
-DIRECTORY='/usr/lib/distcc'
-SYMLINKS='cc c++ gcc g++'
-unset NOT_INSTALLED
-if [ ! -d "$DIRECTORY" ]; then
-	if [ -w '/usr/lib' ]; then
-		install -d "$DIRECTORY"
-		if [ $? -gt 0 ]; then
-			echo "post-install: error creating '$DIRECTORY'."
-		else
-			echo "post-install: '$DIRECTORY' created."
-		fi
-		cd "$DIRECTORY"
-		for c in $SYMLINKS; do
-				if [ ! -e "$DIRECTORY/$c" ]; then
-					NOT_INSTALLED='yes'
-				fi
-			done
-			if [ "$NOT_INSTALLED" ]; then
-				echo "post-install: in directory '$DIRECTORY'."
-			fi
-		for c in $SYMLINKS; do
-			if [ ! -e "$DIRECTORY/$c" ]; then
-				ln -s '../../bin/distcc' "$c"
-				if [ $? -gt 0 ]; then
-					echo "post-install: error creating symlink '../../bin/distcc -> $c'."
-					exit 1
-				else
-					echo "post-install: create symlink '../../bin/distcc -> $c'."
-				fi
-			fi
-		done
-		cd - > /dev/null
-	else
-		echo "post-install: error no permission to create directory '$DIRECTORY'."
-		exit 1
-	fi
-fi
-unset NOT_INSTALLED SYMLINKS DIRECTORY
-# End of file
diff --git a/distcc/post-remove b/distcc/post-remove
deleted file mode 100755
index 987699385..000000000
--- a/distcc/post-remove
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-DIRECTORY='/usr/lib/distcc'
-if [ -d "$DIRECTORY" ]; then
-	if [ -w "$DIRECTORY" ]; then
-		rm -r "$DIRECTORY"
-		if [ $? -gt 0 ]; then
-			echo "post-remove: error remove '$DIRECTORY' failed."
-		else
-			echo "post-remove: '$DIRECTORY' removed."
-		fi
-	else
-		echo "post-remove: error no permission to remove '$DIRECTORY'."
-	fi
-fi
-unset DIRECTORY
-# End of file