Remove the now unnecessary Makefiles, they get generated automaticall…

…y by qmake. Fix a minor bug where it wouldn't consider two shows with the same title and same start time but on different channels to be conflicting. git-svn-id: http://svn.mythtv.org/svn/trunk@123 7dbf422c-18fa-0310-86e9-fd20926502f2
MythTV · Jul 17, 2002 · c6955ac · c6955ac
1 parent 1be3d5e
commit c6955ac
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 1,032 deletions.
diff --git a/mythtv/libs/libNuppelVideo/Makefile b/mythtv/libs/libNuppelVideo/Makefile
diff --git a/mythtv/libs/libmythtv/Makefile b/mythtv/libs/libmythtv/Makefile
diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
@@ -12,11 +12,11 @@ INCLUDEPATH += ../libNuppelVideo
 TARGETDEPS = ../libNuppelVideo/libNuppelVideo.a 
 
 installfiles.path = /usr/local/share/mythtv
-installfiles.files = helr.ttf settings.txt
+installfiles.files = helr.ttf
 
-#!exists( /usr/local/share/mythtv/settings.txt ) {
-#    installfiles.files += settings.txt
-#}
+!exists( /usr/local/share/mythtv/settings.txt ) {
+    installfiles.files += settings.txt
+}
 
 INSTALLS = installfiles