diff options
| author | Jonathan Callen <en.ABCD@gmail.com> | 2009-06-27 19:09:45 -0400 |
|---|---|---|
| committer | Jonathan Callen <en.ABCD@gmail.com> | 2009-06-27 19:09:45 -0400 |
| commit | 1933ec336c797dd951efb22caadbc5236bb74165 (patch) | |
| tree | 784a1a14fa5bb28b48a39c93a147c1a6d5be00dd /eclass/kde4-meta.eclass | |
| parent | 29cb57c1c3e2ba6f83658a11907da41395179203 (diff) | |
| download | kde-1933ec336c797dd951efb22caadbc5236bb74165.tar.gz kde-1933ec336c797dd951efb22caadbc5236bb74165.tar.bz2 kde-1933ec336c797dd951efb22caadbc5236bb74165.zip | |
[eclass] Fix previous commit
Diffstat (limited to 'eclass/kde4-meta.eclass')
| -rw-r--r-- | eclass/kde4-meta.eclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 3853dff0e82..e0abec9a7a0 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -641,11 +641,11 @@ kde4-meta_change_cmakelists() { koffice) # prevent collisions if [[ ${PN} != koffice-data ]]; then + sed -i -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \ + "${S}"/cmake/modules/CMakeLists.txt || \ + die "${LINENO}: sed died in collision prevention section" case ${PV} in 2.0.*) - sed -i -e '/install(.*FindKOfficeLibs.cmake/,/)/ d' \ - "${S}"/cmake/modules/CMakeLists.txt || \ - die "${LINENO}: sed died in collision prevention section" sed -i -n -e '1h;1!H;${g;s/install(.\+config-openexr.h.\+)//;p}' \ "${S}"/CMakeLists.txt || \ die "${LINENO}: sed died in collision prevention section" |