[Lunar-commits] CVS: moonbase/libs/readline BUILD,1.3,1.4

[Auke Kok]

Update of /var/cvs/lunar/moonbase/libs/readline
In directory espresso.foo-projects.org:/home/sofar/active/moonbase/libs/readline

Modified Files:
	BUILD 
Log Message:
mod: properly install inputrc, change order a bit, beautified, and ldconfig isn't needed.


Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/libs/readline/BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- BUILD	29 Jul 2004 20:54:06 -0000	1.3
+++ BUILD	23 Feb 2005 10:16:11 -0000	1.4
@@ -1,29 +1,26 @@
 (
 
-export OUR_OLD_READLINE_VVV=$(lvu installed readline | perl -pe 's/([0-9]).+/$1/') &&
-# ************************ WARNING *************************
-# DO NOT MESS WITH THE CONFIGURE STUFF here unless you
-# really know what you're doing! We chose the lib location
-# specifically so we could link readline to bash which is
-# needed at init time! If you move it you could break your 
-# system!
+  export OUR_OLD_READLINE_VVV=$(lvu installed readline | perl -pe 's/([0-9]).+/$1/') &&
+  # ************************ WARNING *************************
+  # DO NOT MESS WITH THE CONFIGURE STUFF here unless you
+  # really know what you're doing! We chose the lib location
+  # specifically so we could link readline to bash which is
+  # needed at init time! If you move it you could break your 
+  # system!
 
   ./configure --libdir=/lib              \
               --prefix=/usr              \
               --mandir=/usr/share/man    \
               --infodir=/usr/share/info  &&
-default_make                                   &&
-# temp hack to help in change over to readline-5.0 from readline-4.x
-# can be removed when everyone is over to readline 5.0
-devoke_installwatch &&
-ln -sf /lib/libreadline.so.5.0 /lib/libreadline.so.4 &&
-ln -sf /lib/libhistory.so.5.0  /lib/libhistory.so.4  &&
-invoke_installwatch &&
-ldconfig
-
-) > $C_FIFO 2>&1 &&
+  default_make                           &&
+  if [ ! -e /etc/inputrc ] ; then 
+    install $SCRIPT_DIRECTORY/inputrc /etc/
+  fi                                     &&
+  # temp hack to help in change over to readline-5.0 from readline-4.x
+  # can be removed when everyone is over to readline 5.0
+  devoke_installwatch                                  &&
+  ln -sf /lib/libreadline.so.5.0 /lib/libreadline.so.4 &&
+  ln -sf /lib/libhistory.so.5.0  /lib/libhistory.so.4  &&
+  invoke_installwatch                                  &&
 
-(
-  [ -e /etc/inputrc ] || cp $SCRIPT_DIRECTORY/inputrc /etc
-  true
-)
+) > $C_FIFO 2>&1