[Lunar-commits] Revert "makeobj: reverting.". Fix this for good.

Moritz Heiber moe at lunar-linux.org
Wed Feb 6 20:27:33 CET 2008


commit e12c8801b15b41cdb7445206108eb876679d6f41
Author: Moritz Heiber <moe at lunar-linux.org>
Date:   Wed Feb 6 20:27:33 2008 +0100

    Revert "makeobj: reverting.". Fix this for good.
    
    This reverts commit c55459e7c8948a8590d3d5cdef32cbeea64409b7.
    
    Conflicts:
    
    	kde4/base/makeobj/BUILD
    	kde4/base/makeobj/PRE_BUILD
---
 kde4/base/makeobj/BUILD     |    2 +-
 kde4/base/makeobj/PRE_BUILD |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kde4/base/makeobj/BUILD b/kde4/base/makeobj/BUILD
index a7e809c..0422d03 100644
--- a/kde4/base/makeobj/BUILD
+++ b/kde4/base/makeobj/BUILD
@@ -8,6 +8,6 @@
   echo export PATH=\"'${PATH}':${MODULE_PREFIX}/bin\" >> $SOURCE_DIRECTORY/kde4.rc  &&
   echo export PKG_CONFIG_PATH=\"'${PKG_CONFIG_PATH}':${MODULE_PREFIX}/lib/pkgconfig\" >> $SOURCE_DIRECTORY/kde4.rc &&
 
-  install -m644 $SOURCE_DIRECTORY/kde4.rc /etc/profile.d/
+  install -m644 kde4.rc /etc/profile.d/
 
 ) > $C_FIFO 2>&1
diff --git a/kde4/base/makeobj/PRE_BUILD b/kde4/base/makeobj/PRE_BUILD
index 27ba77d..3b7c8cd 100644
--- a/kde4/base/makeobj/PRE_BUILD
+++ b/kde4/base/makeobj/PRE_BUILD
@@ -1 +1,2 @@
-true
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY


More information about the Lunar-commits mailing list