aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@nehalem.(none)>2011-03-28 02:12:43 (GMT)
committerMauro Carvalho Chehab <mchehab@nehalem.(none)>2011-03-28 02:12:43 (GMT)
commit90cd584dd356f6674bc225dedcc48aa7c4c57539 (patch)
treeb1a4d724db8b6fd8191b378380d1f5bc03546273
parente7d0ae06c74f55562c1589feb5a6802d77c14dbc (diff)
Remove yaVDR files at rminstall target
Ubuntu's based yaVDR puts driver stuff also at the wrong dir Signed-off-by: Mauro Carvalho Chehab <mchehab@nehalem.(none)>
-rwxr-xr-xv4l/scripts/make_makefile.pl13
1 files changed, 8 insertions, 5 deletions
diff --git a/v4l/scripts/make_makefile.pl b/v4l/scripts/make_makefile.pl
index 884f4ad..2827839 100755
--- a/v4l/scripts/make_makefile.pl
+++ b/v4l/scripts/make_makefile.pl
@@ -161,11 +161,12 @@ sub removeobsolete()
}
#
-# Special hack for Ubuntu with their non-standard dir
+# Special hack for Ubuntu with their non-standard dirs
#
-sub removeubuntu()
+sub removeubuntu($)
{
- my $dest = "/lib/modules/\$(KERNELRELEASE)/ubuntu/media";
+ my $udir = shift;
+ my $dest = "/lib/modules/\$(KERNELRELEASE)/$udir";
my $filelist;
while ( my ($dir, $files) = each(%instdir) ) {
@@ -209,7 +210,8 @@ find({wanted => \&parse_dir, no_chdir => 1}, '../linux/drivers/staging');
print OUT "media-install::\n";
removeobsolete();
-removeubuntu();
+removeubuntu("/ubuntu/media");
+removeubuntu("/updates/dkms");
print OUT "\t\@echo \"Installing kernel modules under \$(DESTDIR)\$(KDIR26)/:\"\n";
@@ -234,7 +236,8 @@ print OUT "\t/sbin/depmod -a \$(KERNELRELEASE) \$(if \$(DESTDIR),-b \$(DESTDIR))
print OUT "media-rminstall::\n";
removeobsolete();
-removeubuntu();
+removeubuntu("/ubuntu/media");
+removeubuntu("/updates/dkms");
while ( my ($dir, $files) = each(%instdir) ) {
print OUT "\t\@echo -e \"\\nRemoving old \$(KDIR26)/$dir files:\"\n";

Privacy Policy