r1776 - in branches/6.2/packages: coreutils grep popt xorg-server

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sat Dec 9 22:55:41 PST 2006


Author: alexander
Date: 2006-12-09 23:55:39 -0700 (Sat, 09 Dec 2006)
New Revision: 1776

Modified:
   branches/6.2/packages/coreutils/Makefile
   branches/6.2/packages/grep/Makefile
   branches/6.2/packages/popt/Makefile
   branches/6.2/packages/xorg-server/Makefile
Log:
Removed unnecessary differences between 6.2 and trunk

Modified: branches/6.2/packages/coreutils/Makefile
===================================================================
--- branches/6.2/packages/coreutils/Makefile	2006-12-08 14:51:06 UTC (rev 1775)
+++ branches/6.2/packages/coreutils/Makefile	2006-12-10 06:55:39 UTC (rev 1776)
@@ -48,7 +48,6 @@
 	patch -Np1 -i ../$(PATCH2)
 	patch -Np1 -i ../$(PATCH50)
 	chmod +x tests/sort/sort-mb-tests
-	sed -i 's/_LEN 6/_LEN 20/' src/who.c
 	./configure --prefix=/usr
 	make $(PM)
 	make install

Modified: branches/6.2/packages/grep/Makefile
===================================================================
--- branches/6.2/packages/grep/Makefile	2006-12-08 14:51:06 UTC (rev 1775)
+++ branches/6.2/packages/grep/Makefile	2006-12-10 06:55:39 UTC (rev 1776)
@@ -38,6 +38,7 @@
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH50)
+	chmod +x tests/fmbtest.sh
 	./configure --prefix=/usr --bindir=/bin
 	make $(PM)
 	make install

Modified: branches/6.2/packages/popt/Makefile
===================================================================
--- branches/6.2/packages/popt/Makefile	2006-12-08 14:51:06 UTC (rev 1775)
+++ branches/6.2/packages/popt/Makefile	2006-12-10 06:55:39 UTC (rev 1776)
@@ -21,7 +21,6 @@
 
 compile-stage2:
 	sed -i -e "/*origOptString ==/c 0)" popt.c
-	autoreconf -f -i -v
 	./configure --prefix=/usr
 	make $(PM)
 	make install

Modified: branches/6.2/packages/xorg-server/Makefile
===================================================================
--- branches/6.2/packages/xorg-server/Makefile	2006-12-08 14:51:06 UTC (rev 1775)
+++ branches/6.2/packages/xorg-server/Makefile	2006-12-10 06:55:39 UTC (rev 1776)
@@ -35,9 +35,10 @@
 	sed -i -e 's,#ifdef KDRIVESERVER,#if 1,' dix/dixfonts.c
 	patch -Np1 -i ../$(PATCH1)
 	patch -Np1 -i ../$(PATCH2)
-	automake
-	./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-	    --with-mesa-source=`pwd`/$(DIR1) --with-default-font-path=built-ins
+	autoreconf --force --install --verbose
+	./configure --prefix=/usr --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var \
+	    --with-mesa-source=`pwd`/$(DIR1) --with-default-font-path=built-ins \
+	    --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb
 	make
 	make install
 




More information about the livecd mailing list