Author: justin
Date: 2005-11-24 14:02:46 -0700 (Thu, 24 Nov 2005)
New Revision: 1159

Modified:
   branches/6.1.1-newmake/packages/blfs-bootscripts/Makefile
   branches/6.1.1-newmake/packages/sudo/Makefile
   branches/dm/packages/blfs-bootscripts/Makefile
   branches/dm/packages/sudo/Makefile
   branches/utf8-newmake/packages/sudo/Makefile
Log:
Merged r1158 (Adjust sudo to BLFS, fix rsync bootscript) from trunk to dm, 
6.1.1-newmake and utf8-newmake.

Modified: branches/6.1.1-newmake/packages/blfs-bootscripts/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/blfs-bootscripts/Makefile   2005-11-24 
20:51:51 UTC (rev 1158)
+++ branches/6.1.1-newmake/packages/blfs-bootscripts/Makefile   2005-11-24 
21:02:46 UTC (rev 1159)
@@ -35,7 +35,8 @@
        install -m754 blfs/init.d/nfs-server /etc/rc.d/init.d/ 
        install -m754 blfs/init.d/nfs-client /etc/rc.d/init.d/ 
        install -m754 blfs/init.d/iptables /etc/rc.d/init.d/ 
-       install -m754 blfs/init.d/rsync /etc/rc.d/init.d/ 
+       install -m754 blfs/init.d/rsyncd /etc/rc.d/init.d/
+       sed -i 's| --compress||' /etc/rc.d/init.d/rsyncd
 
 clean:
        -rm -rf $(DIR)

Modified: branches/6.1.1-newmake/packages/sudo/Makefile
===================================================================
--- branches/6.1.1-newmake/packages/sudo/Makefile       2005-11-24 20:51:51 UTC 
(rev 1158)
+++ branches/6.1.1-newmake/packages/sudo/Makefile       2005-11-24 21:02:46 UTC 
(rev 1159)
@@ -20,8 +20,9 @@
        $(std_build)
 
 compile-stage2:
-       ./configure --prefix=/usr
-       make $(PM)
+       ./configure --prefix=/usr --libexecdir=/usr/lib \
+        --enable-noargs-shell --with-ignore-dot --with-all-insults
+       make
        make install
 
 clean:

Modified: branches/dm/packages/blfs-bootscripts/Makefile
===================================================================
--- branches/dm/packages/blfs-bootscripts/Makefile      2005-11-24 20:51:51 UTC 
(rev 1158)
+++ branches/dm/packages/blfs-bootscripts/Makefile      2005-11-24 21:02:46 UTC 
(rev 1159)
@@ -35,7 +35,8 @@
        install -m754 blfs/init.d/nfs-server /etc/rc.d/init.d/ 
        install -m754 blfs/init.d/nfs-client /etc/rc.d/init.d/ 
        install -m754 blfs/init.d/iptables /etc/rc.d/init.d/ 
-       install -m754 blfs/init.d/rsync /etc/rc.d/init.d/ 
+       install -m754 blfs/init.d/rsyncd /etc/rc.d/init.d/
+       sed -i 's| --compress||' /etc/rc.d/init.d/rsyncd
 
 clean:
        -rm -rf $(DIR)

Modified: branches/dm/packages/sudo/Makefile
===================================================================
--- branches/dm/packages/sudo/Makefile  2005-11-24 20:51:51 UTC (rev 1158)
+++ branches/dm/packages/sudo/Makefile  2005-11-24 21:02:46 UTC (rev 1159)
@@ -20,8 +20,9 @@
        $(std_build)
 
 compile-stage2:
-       ./configure --prefix=/usr
-       make $(PM)
+       ./configure --prefix=/usr --libexecdir=/usr/lib \
+        --enable-noargs-shell --with-ignore-dot --with-all-insults
+       make
        make install
 
 clean:

Modified: branches/utf8-newmake/packages/sudo/Makefile
===================================================================
--- branches/utf8-newmake/packages/sudo/Makefile        2005-11-24 20:51:51 UTC 
(rev 1158)
+++ branches/utf8-newmake/packages/sudo/Makefile        2005-11-24 21:02:46 UTC 
(rev 1159)
@@ -20,8 +20,9 @@
        $(std_build)
 
 compile-stage2:
-       ./configure --prefix=/usr
-       make $(PM)
+       ./configure --prefix=/usr --libexecdir=/usr/lib \
+        --enable-noargs-shell --with-ignore-dot --with-all-insults
+       make
        make install
 
 clean:

-- 
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to