diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-04-01 21:43:16 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-04-01 21:43:16 +0000 |
| commit | 9c599c8bdf63a39f134b0aa48c1c00bae43b1f84 (patch) | |
| tree | 1a291db8ec0b8b513377004b9db63bb8f8f0b4bb | |
| parent | 63dbfac3363d996ca49ef38294879d6b6207d6d5 (diff) | |
| download | rpm-setup-9c599c8bdf63a39f134b0aa48c1c00bae43b1f84.tar rpm-setup-9c599c8bdf63a39f134b0aa48c1c00bae43b1f84.tar.gz rpm-setup-9c599c8bdf63a39f134b0aa48c1c00bae43b1f84.tar.bz2 rpm-setup-9c599c8bdf63a39f134b0aa48c1c00bae43b1f84.tar.xz rpm-setup-9c599c8bdf63a39f134b0aa48c1c00bae43b1f84.zip | |
prefer DEST_MODULE_NAME over BUILT_MODULE_NAME if present1.76
| -rw-r--r-- | configure.ac | 2 | ||||
| -rwxr-xr-x | kmod.prov | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 5a6d632..8ca7000 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # $Id$ AC_PREREQ(2.59) -AC_INIT(rpm-mandriva-setup, 1.75, nanardon@mandriva.org) +AC_INIT(rpm-mandriva-setup, 1.76, nanardon@mandriva.org) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(1.9) AC_CONFIG_SRCDIR @@ -16,7 +16,8 @@ dkmslist=$(echo "$provideslist" | egrep '(/var/lib/dkms-binary/[^/]+/[^/]+|/usr/ VERSION=`sed -rne 's/^PACKAGE_VERSION="?([^"]+)"?$/\1/;T;p' $d` [ -z "$VERSION" ] && continue PACKAGE_NAME=`sed -rne 's/^PACKAGE_NAME="?([^"]+)"?$/\1/;T;p' $d` - MODULES=`sed -rne 's/^BUILT_MODULE_NAME\[[0-9]+\]="?([^"]+)"?$/\1/;T;p' $d` + MODULES=`sed -rne 's/^DEST_MODULE_NAME\[[0-9]+\]="?([^"]+)"?$/\1/;T;p' $d` + [ -z "$MODULES" ] && MODULES=`sed -rne 's/^BUILT_MODULE_NAME\[[0-9]+\]="?([^"]+)"?$/\1/;T;p' $d` # default on PACKAGE_NAME if no BUILT_MODULE_NAME is specified [ -z "$MODULES" ] && MODULES=$PACKAGE_NAME echo "$MODULES" | sed -re "s/\\\$PACKAGE_NAME/$PACKAGE_NAME/" | while read m; do |