[Lunar-commits] <moonbase> kdesdk4: Adjusting the BUILD to resolve the conflict between the makeobj script

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Sun May 15 13:59:46 CEST 2011


commit a824e1a2cf04c39a64a4de3a69b9fb5b3b77c85c
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sun May 15 07:59:46 2011 -0400

    kdesdk4: Adjusting the BUILD to resolve the conflict between the makeobj script
    
    installed by kdesdk and our module of the same name in favor of the makeobj module.
---
 kde4/base/kdesdk4/BUILD |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/kde4/base/kdesdk4/BUILD b/kde4/base/kdesdk4/BUILD
index 1268692..6854dc6 100644
--- a/kde4/base/kdesdk4/BUILD
+++ b/kde4/base/kdesdk4/BUILD
@@ -1,5 +1,10 @@
 (
 
+# The scripts/makeobj conflicts with our module of the same name; both provide the same
+# purpose so this one will be deleted. This sed's out makeobj so it does not get installed
+# to /usr/bin.
+  sedit "s:makeobj::" scripts/CMakeLists.txt &&
+
   source /etc/profile.d/qt4.rc   &&
   source /etc/profile.d/kde4.rc  &&
 


More information about the Lunar-commits mailing list