X-Git-Url: http://gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpkgmk.in;h=9fa7e81dcbf81a9eaf10badc17c66dfba8dc4a3c;hb=efcfa70d5114be41d423f3621d089cafbcf97ebf;hp=7378def28e515e5531c5ac5c69986f8ad485d257;hpb=3f0931c4294981d3e3edb8c8ba8e422a4dd3a442;p=pkgutils-cross.git

diff --git a/src/pkgmk.in b/src/pkgmk.in
index 7378def..9fa7e81 100755
--- a/src/pkgmk.in
+++ b/src/pkgmk.in
@@ -166,7 +166,7 @@ unpack_source() {
 		LOCAL_FILENAME=`get_filename $FILE`
 		case $LOCAL_FILENAME in
 			*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tar.xz|*.tar.lzma|*.zip)
-				COMMAND="bsdtar -m -p -o -C $SRC -xf $LOCAL_FILENAME" ;;
+				COMMAND="bsdtar -p -o -C $SRC -xf $LOCAL_FILENAME" ;;
 			*)
 				COMMAND="cp $LOCAL_FILENAME $SRC" ;;
 		esac
@@ -305,6 +305,13 @@ compress_manpages() {
 	done
 }
 
+fix_cross_paths() {
+	# remove the last / from CLFS path if appeared
+	CLFS=${CLFS%*/}
+
+	find $PKG -type f -name '*.la' -exec sed "s|$CLFS||g" -i {} \;
+}
+
 check_footprint() {
 	local FILE="$PKGMK_WORK_DIR/.tmp"
 	
@@ -377,6 +384,7 @@ build_package() {
 		fi
 		
 		compress_manpages
+		fix_cross_paths
 		
 		cd $PKG
 		info "Build result:"