Merge branch 'master' of ssh://vparabola/srv/git/projects/libretools

1 files changed, 6 insertions, 4 deletions

diff --git a/libremakepkg b/libremakepkg
index e46a20a..b02b778 100755
--- a/libremakepkg
+++ b/libremakepkg
@@ -32,6 +32,7 @@ function usage {
     echo " -c : cleans CHCOPY before building."
     echo " -u : updates CHROOT before building."
     echo " -n : use this dir instead of CHCOPY."
+    echo " -M \"makepkg long arg\" : passes long args to makepkg, use it as many times as needed."
     echo " -I pkgname : install this package, use it as many times needed."
     echo
 }
@@ -41,8 +42,9 @@ CLEAN_CACHE=""
 update_first="n"
 chrootname=${CHCOPY}
 _PKGINSTALL=""
+_MAKEPKG_ARGS=""
 #libremakepkg own args
-libremakepkgargs='hcun:I:'
+libremakepkgargs='hcun:I:M:'
 #now makepkg args
 libremakepkgargs+='ACdefiLmop:rRs'
 
@@ -53,7 +55,8 @@ while getopts ${libremakepkgargs} arg ; do
 	u) update_first="y" ;;
 	n) chrootname="$OPTARG"; echo $chrootname ;;
 	I) _PKGINSTALL+="-I $OPTARG " ;;
-	*) _MAKEPKG_ARGS="$MAKEPKG_ARGS -$arg $OPTARG" ;;
+	M) _MAKEPKG_ARGS+=" $OPTARG" ;;
+	*) _MAKEPKG_ARGS+=" -$arg $OPTARG" ;;
     esac
 done
 
@@ -79,5 +82,4 @@ fi
 
 msg "Creating the package"
 makechrootpkg $_CLEAN -r ${CHROOTDIR} -l "${chrootname}" $_PKGINSTALL -- $_MAKEPKG_ARGS
-
-exit 0
+exit $?