[Lunar-commits] r18545 - moonbase/trunk/net/rp-pppoe

[Auke Kok]

Author: sofar
Date: 2006-02-06 16:21:07 +0000 (Mon, 06 Feb 2006)
New Revision: 18545

Modified:
   moonbase/trunk/net/rp-pppoe/BUILD
Log:
Fix tkpppoe dekstop items being installed as *alien* files. Also chaining the &&'s correctly here so a compile error will be noticed properly.


Modified: moonbase/trunk/net/rp-pppoe/BUILD
===================================================================
--- moonbase/trunk/net/rp-pppoe/BUILD	2006-02-06 16:15:15 UTC (rev 18544)
+++ moonbase/trunk/net/rp-pppoe/BUILD	2006-02-06 16:21:07 UTC (rev 18545)
@@ -1,34 +1,29 @@
 (
 
-  sedit  "s/read a/a=0/"  scripts/pppoe-setup.in
-  cd  src
+  sedit "s/read a/a=0/" scripts/pppoe-setup.in
+  cd src
   ./configure  --build=$BUILD           \
                --prefix=/usr            \
                --sysconfdir=/etc        \
                --localstatedir=/var     \
                --mandir=/usr/share/man  \
                $OPTS                   &&
-  sedit "s/docdir=\/usr\/doc/docdir=\/usr\/share\/doc/" Makefile
-  make           &&
-  cd  ../gui     &&
-  default_make   &&
-  cd  ../src     &&
-  make  install  &&
-  ln -sf /usr/sbin/pppoe-start    /usr/sbin/adsl-start
-  ln -sf /usr/sbin/pppoe-stop     /usr/sbin/adsl-stop
-  ln -sf /usr/sbin/pppoe-status   /usr/sbin/adsl-status
-  ln -sf /usr/sbin/pppoe-connect  /usr/sbin/adsl-connect
-  ln -sf /usr/sbin/pppoe-setup    /usr/sbin/adsl-setup
+  sedit "s/docdir=\/usr\/doc/docdir=\/usr\/share\/doc/" Makefile &&
+  make          &&
+  cd ../gui     &&
+  default_make  &&
+  cd ../src     &&
+  make install  &&
 
-) > $C_FIFO 2>&1  &&  (
+  ln -sf /usr/sbin/pppoe-{start,stop,status,connect,setup} /usr/sbin/ &&
+  mkdir -p /usr/share/applnk/Internet  &&
+  mkdir -p /usr/share/gnome/apps/Internet  &&
+  install $SCRIPT_DIRECTORY/tkpppoe.kdelnk /usr/share/applnk/Internet/ &&
+  cp $SCRIPT_DIRECTORY/tkpppoe.desktop /usr/share/gnome/apps/Internet/ &&
 
-  mkdir  -p  /usr/share/applnk/Internet
-  mkdir  -p  /usr/share/gnome/apps/Internet
-  cp  $SCRIPT_DIRECTORY/tkpppoe.kdelnk   /usr/share/applnk/Internet
-  cp  $SCRIPT_DIRECTORY/tkpppoe.desktop  /usr/share/gnome/apps/Internet
-
-  case  $CONFIG_PPPOE  in
-    y|Y|j|J)  sh  scripts/pppoe-setup  ;;
-          *)  true  ;;
+  case $CONFIG_PPPOE in
+    y|Y|j|J) sh scripts/pppoe-setup ;;
+          *) true ;;
   esac
-)
+
+) > $C_FIFO 2>&1