Author: alexander
Date: 2007-04-30 03:45:40 -0600 (Mon, 30 Apr 2007)
New Revision: 1871
Modified:
trunk/packages/bzip2/Makefile
trunk/packages/dosfstools/Makefile
trunk/packages/hibernate-script/Makefile
trunk/packages/iptables/Makefile
trunk/packages/libjpeg/Makefile
trunk/packages/mutt/Makefile
trunk/packages/synaptics/Makefile
trunk/packages/unzip/Makefile
trunk/packages/wireless_tools/Makefile
trunk/packages/zip/Makefile
Log:
Finished the /usr/{man,info,doc} -> /usr/share/{man,info,doc} transition
Modified: trunk/packages/bzip2/Makefile
===================================================================
--- trunk/packages/bzip2/Makefile 2007-04-30 09:43:43 UTC (rev 1870)
+++ trunk/packages/bzip2/Makefile 2007-04-30 09:45:40 UTC (rev 1871)
@@ -32,16 +32,17 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
+ sed -i 's,X)/man,X)/share/man,g' Makefile
make -f Makefile-libbz2_so
make clean
make
make PREFIX=/usr install
cp -v bzip2-shared /bin/bzip2
cp -av libbz2.so* /lib
- ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
+ ln -svf ../../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
+ ln -svf bzip2 /bin/bunzip2
+ ln -svf bzip2 /bin/bzcat
clean:
-rm -rf $(DIR)
Modified: trunk/packages/dosfstools/Makefile
===================================================================
--- trunk/packages/dosfstools/Makefile 2007-04-30 09:43:43 UTC (rev 1870)
+++ trunk/packages/dosfstools/Makefile 2007-04-30 09:45:40 UTC (rev 1871)
@@ -22,7 +22,7 @@
compile-stage2:
sed -i 's,ln -s,ln -sf,' */Makefile
make
- make install
+ make MANDIR=/usr/share/man/man8 install
clean:
-rm -rf $(DIR)
Modified: trunk/packages/hibernate-script/Makefile
===================================================================
--- trunk/packages/hibernate-script/Makefile 2007-04-30 09:43:43 UTC (rev
1870)
+++ trunk/packages/hibernate-script/Makefile 2007-04-30 09:45:40 UTC (rev
1871)
@@ -24,7 +24,7 @@
compile-stage2:
patch -Np1 -i ../$(PATCH1)
rm -rf /etc/hibernate
- yes | PREFIX=/usr ./install.sh
+ yes | PREFIX=/usr MAN_DIR=/usr/share/man ./install.sh
clean:
-rm -rf $(DIR)
Modified: trunk/packages/iptables/Makefile
===================================================================
--- trunk/packages/iptables/Makefile 2007-04-30 09:43:43 UTC (rev 1870)
+++ trunk/packages/iptables/Makefile 2007-04-30 09:45:40 UTC (rev 1871)
@@ -20,8 +20,8 @@
$(std_build)
compile-stage2:
- make PREFIX=/usr LIBDIR=/lib BINDIR=/bin
- make PREFIX=/usr LIBDIR=/lib BINDIR=/bin install
+ make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man
+ make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man install
clean:
-rm -rf $(DIR)
Modified: trunk/packages/libjpeg/Makefile
===================================================================
--- trunk/packages/libjpeg/Makefile 2007-04-30 09:43:43 UTC (rev 1870)
+++ trunk/packages/libjpeg/Makefile 2007-04-30 09:45:40 UTC (rev 1871)
@@ -22,7 +22,7 @@
compile-stage2:
./configure --prefix=/usr --enable-static --enable-shared
make
- make install
+ make mandir=/usr/share/man/man1 install
/sbin/ldconfig
clean:
Modified: trunk/packages/mutt/Makefile
===================================================================
--- trunk/packages/mutt/Makefile 2007-04-30 09:43:43 UTC (rev 1870)
+++ trunk/packages/mutt/Makefile 2007-04-30 09:45:40 UTC (rev 1871)
@@ -20,7 +20,8 @@
$(std_build)
compile-stage2:
- ./configure --prefix=/usr --sysconfdir=/etc --enable-imap \
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --with-docdir=/usr/share/doc/mutt --enable-imap \
--enable-pop --with-ssl --enable-hcache
make
make install
Modified: trunk/packages/synaptics/Makefile
===================================================================
--- trunk/packages/synaptics/Makefile 2007-04-30 09:43:43 UTC (rev 1870)
+++ trunk/packages/synaptics/Makefile 2007-04-30 09:45:40 UTC (rev 1871)
@@ -20,8 +20,8 @@
$(std_build)
compile-stage2:
- make PREFIX=/usr
- make PREFIX=/usr install
+ make PREFIX=/usr MANDIR=/usr/share/man
+ make PREFIX=/usr MANDIR=/usr/share/man install
clean:
-rm -rf $(DIR)
Modified: trunk/packages/unzip/Makefile
===================================================================
--- trunk/packages/unzip/Makefile 2007-04-30 09:43:43 UTC (rev 1870)
+++ trunk/packages/unzip/Makefile 2007-04-30 09:45:40 UTC (rev 1871)
@@ -21,7 +21,7 @@
compile-stage2:
make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
- make prefix=/usr install
+ make prefix=/usr MANDIR=/usr/share/man/man1 install
clean:
-rm -rf $(DIR)
Modified: trunk/packages/wireless_tools/Makefile
===================================================================
--- trunk/packages/wireless_tools/Makefile 2007-04-30 09:43:43 UTC (rev
1870)
+++ trunk/packages/wireless_tools/Makefile 2007-04-30 09:45:40 UTC (rev
1871)
@@ -21,7 +21,7 @@
compile-stage2:
make PREFIX=/usr
- make PREFIX=/usr install
+ make PREFIX=/usr INSTALL_MAN=/usr/share/man install
clean:
-rm -rf $(DIR)
Modified: trunk/packages/zip/Makefile
===================================================================
--- trunk/packages/zip/Makefile 2007-04-30 09:43:43 UTC (rev 1870)
+++ trunk/packages/zip/Makefile 2007-04-30 09:45:40 UTC (rev 1871)
@@ -21,8 +21,8 @@
compile-stage2:
sed -i -e '[EMAIL PROTECTED](INSTALL) man/[EMAIL
PROTECTED](INSTALL_PROGRAM) man/zip.1@' unix/Makefile
- make prefix=/usr -f unix/Makefile generic_gcc
- make prefix=/usr -f unix/Makefile install
+ make prefix=/usr MANDIR=/usr/share/man/man1 -f unix/Makefile generic_gcc
+ make prefix=/usr MANDIR=/usr/share/man/man1 -f unix/Makefile install
clean:
-rm -rf $(DIR)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
