Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a4df142775db25b766021ce6a7205106e2e58860
commit a4df142775db25b766021ce6a7205106e2e58860
Author: Michel Hermier <[EMAIL PROTECTED]>
Date: Mon Oct 6 20:12:41 2008 +0200
nvidia.sh nvidia.install
* Point the install comment to the correct documentation path.
diff --git a/source/include/nvidia.install b/source/include/nvidia.install
index 568aa79..4aa4e9c 100644
--- a/source/include/nvidia.install
+++ b/source/include/nvidia.install
@@ -1,6 +1,6 @@
post_install() {
echo "*** In order to use this package you have to accept Nvidia's license
which"
- echo "*** can be found at /usr/share/doc/nvidia-*/LICENSE."
+ echo "*** can be found at /usr/share/doc/$pkgname-$pkgver/LICENSE."
echo "*** If you don't accept it, please remove the package!"
if [ -e /etc/X11/xorg.conf ]; then
diff --git a/source/include/nvidia.sh b/source/include/nvidia.sh
index 88cdbc9..c22a608 100644
--- a/source/include/nvidia.sh
+++ b/source/include/nvidia.sh
@@ -104,10 +104,19 @@ Finclude kernel-module
###
# == PROVIDED FUNCTIONS
+# * Fbuild_nvidia_scriptlet: Build the nvidia scriplet
# * Fbuild_nvidia: Builds the software
# * build(): just calls Fbuild_nvidia
###
+Fbuild_nvidia_scriptlet()
+{
+ cp $Fincdir/nvidia.install ${Fsrcdir%/src}
+ Fsed '$pkgname' "$pkgname" ${Fsrcdir%/src}/$_F_kernelmod_scriptlet
+ Fsed '$pkgver' "$pkgver" ${Fsrcdir%/src}/$_F_kernelmod_scriptlet
+ Fbuild_kernelmod_scriptlet
+}
+
Fbuild_nvidia() {
cd $Fsrcdir
sh $_F_nvidia_name.run --extract-only
@@ -163,10 +172,7 @@ Fbuild_nvidia() {
make SYSSRC=$_F_kernelmod_dir/build module || Fdie
cd ../../.. || Fdie
Ffilerel usr/src/nv/nvidia.ko $_F_kernelmod_dir/kernel/drivers/video/nvidia.ko
-
- # Kernel module scriptlet
- cp $Fincdir/nvidia.install ${Fsrcdir%/src}
- Fbuild_kernelmod_scriptlet
+ Fbuild_nvidia_scriptlet
# Documentation
Fdoc $_F_cd_path/LICENSE
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
