diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:53:13 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:53:13 -0600 |
| commit | ef9eb4959e8e2df853a8dcdf31a21b525fd42808 (patch) | |
| tree | 21de67543a92a816b308e12c7cfc30699cc56caf /admin | |
| parent | 2ec1b629e4a1e15db7d1563f6c5db1c307aa9ea7 (diff) | |
| download | tdeio-locate-ef9eb4959e8e2df853a8dcdf31a21b525fd42808.tar.gz tdeio-locate-ef9eb4959e8e2df853a8dcdf31a21b525fd42808.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/detect_uds_hidden.diff | 2 | ||||
| -rw-r--r-- | admin/kde.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/admin/detect_uds_hidden.diff b/admin/detect_uds_hidden.diff index 254de80..98805c9 100644 --- a/admin/detect_uds_hidden.diff +++ b/admin/detect_uds_hidden.diff @@ -8,7 +8,7 @@ diff -ur bksys-1.5.1.pre4/admin/kde.py kio-locate/admin/kde.py + ## check if KDE has the UDS_HIDDEN patch + print "Checking KDE for UDS_HIDDEN : ", -+ if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/kio/global.h').read(): ++ if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/tdeio/global.h').read(): + env['HAVE_UDS_HIDDEN']='1' + p('GREEN', 'yes') + else: diff --git a/admin/kde.py b/admin/kde.py index 955a515..a67f722 100644 --- a/admin/kde.py +++ b/admin/kde.py @@ -248,7 +248,7 @@ def detect_kde(env): ## check if KDE has the UDS_HIDDEN patch print "Checking KDE for UDS_HIDDEN : ", - if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/kio/global.h').read(): + if 'UDS_HIDDEN' in os.popen('cat ' + env['KDEINCLUDEPATH'] + '/tdeio/global.h').read(): env['HAVE_UDS_HIDDEN']='1' p('GREEN', 'yes') else: |