Author: jhuntwork
Date: 2006-05-07 17:55:14 -0600 (Sun, 07 May 2006)
New Revision: 1534
Modified:
trunk/Makefile
trunk/packages/bzip2/Makefile
trunk/packages/curl/Makefile
trunk/packages/flex/Makefile
trunk/packages/libidn/Makefile
Log:
Got rid of LIB_MAYBE64
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2006-05-07 23:31:56 UTC (rev 1533)
+++ trunk/Makefile 2006-05-07 23:55:14 UTC (rev 1534)
@@ -396,7 +396,7 @@
@install -m644 doc/README $(MP)/root/README
@sed -i "s/\[version\]/$(VERSION)/" $(MP)/root/README
@install -m600 root/.bashrc $(MP)/root/.bashrc
- @sed -e 's|_LINKER_|$(LINKER)|' -e 's|/lib/|/$(LIB_MAYBE64)/|'
scripts/shutdown-helper > $(MP)/usr/bin/shutdown-helper
+ @sed 's|_LINKER_|$(LINKER)|' scripts/shutdown-helper >
$(MP)/usr/bin/shutdown-helper
@chmod 755 $(MP)/usr/bin/shutdown-helper
@cp -ra root $(MP)/etc/skel
Modified: trunk/packages/bzip2/Makefile
===================================================================
--- trunk/packages/bzip2/Makefile 2006-05-07 23:31:56 UTC (rev 1533)
+++ trunk/packages/bzip2/Makefile 2006-05-07 23:55:14 UTC (rev 1534)
@@ -45,8 +45,8 @@
make $(PM)
make install
cp -v bzip2-shared /bin/bzip2
- cp -av libbz2.so* /$(LIB_MAYBE64)
- ln -sv ../../$(LIB_MAYBE64)/libbz2.so.1.0 /usr/$(LIB_MAYBE64)/libbz2.so
+ cp -av libbz2.so* /lib
+ ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
rm -v /usr/bin/{bunzip2,bzcat,bzip2}
ln -sv bzip2 /bin/bunzip2
ln -sv bzip2 /bin/bzcat
Modified: trunk/packages/curl/Makefile
===================================================================
--- trunk/packages/curl/Makefile 2006-05-07 23:31:56 UTC (rev 1533)
+++ trunk/packages/curl/Makefile 2006-05-07 23:55:14 UTC (rev 1534)
@@ -20,7 +20,7 @@
$(std_build)
compile-stage2:
- ./configure --prefix=/usr --libdir=/usr/$(LIB_MAYBE64)
+ ./configure --prefix=/usr --libdir=/usr/lib
make $(PM)
make install
find docs -name "Makefile*" -o -name "*.1" -o -name "*.3" | xargs rm
Modified: trunk/packages/flex/Makefile
===================================================================
--- trunk/packages/flex/Makefile 2006-05-07 23:31:56 UTC (rev 1533)
+++ trunk/packages/flex/Makefile 2006-05-07 23:55:14 UTC (rev 1534)
@@ -24,7 +24,7 @@
./configure --prefix=/usr
make $(PM)
make install
- ln -sfv libfl.a /usr/$(LIB_MAYBE64)/libl.a
+ ln -sfv libfl.a /usr/lib/libl.a
echo "#!/bin/sh" > /usr/bin/lex
echo "# Begin /usr/bin/lex" >> /usr/bin/lex
echo "" >> /usr/bin/lex
Modified: trunk/packages/libidn/Makefile
===================================================================
--- trunk/packages/libidn/Makefile 2006-05-07 23:31:56 UTC (rev 1533)
+++ trunk/packages/libidn/Makefile 2006-05-07 23:55:14 UTC (rev 1534)
@@ -20,7 +20,7 @@
$(std_build)
compile-stage2:
- ./configure --prefix=/usr --libdir=/usr/$(LIB_MAYBE64)
+ ./configure --prefix=/usr --libdir=/usr/lib
make $(PM)
make install
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
