# HG changeset patch # User Pascal Bellard # Date 1467799726 -7200 # Node ID e8c84b81fa044c956da828e267cb6ec36ca7af47 # Parent f6af821600e619fb945a8369bbe6a02bc227852e indent, laptop-mode-tools, lbreakout2, lm-sensors, logrotate, magicrescue, mgetty: fix man or doc path diff -r f6af821600e6 -r e8c84b81fa04 indent/receipt --- a/indent/receipt Wed Jul 06 10:06:06 2016 +0200 +++ b/indent/receipt Wed Jul 06 12:08:46 2016 +0200 @@ -13,8 +13,9 @@ # Rules to configure and make the package. compile_rules() { - cd $src - ./configure $CONFIGURE_ARGS && make && make install + rm -f man/indent.1 + sed -i 's|/doc/|/share&|' doc/Makefile* + ./configure $CONFIGURE_ARGS && make -j 1 && make install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r f6af821600e6 -r e8c84b81fa04 laptop-mode-tools/receipt --- a/laptop-mode-tools/receipt Wed Jul 06 10:06:06 2016 +0200 +++ b/laptop-mode-tools/receipt Wed Jul 06 12:08:46 2016 +0200 @@ -14,7 +14,7 @@ # Rules to configure and make the package. compile_rules() { - cd $src + sed -i 's|/usr/man|/usr/share/man|' install.sh make DESTDIR=$DESTDIR INIT_D=none install } @@ -31,4 +31,3 @@ cp -a $install/lib/udev $fs/lib/ cp -a $install/usr/lib/ $fs/usr/ } - diff -r f6af821600e6 -r e8c84b81fa04 lbreakout2/receipt --- a/lbreakout2/receipt Wed Jul 06 10:06:06 2016 +0200 +++ b/lbreakout2/receipt Wed Jul 06 12:08:46 2016 +0200 @@ -17,7 +17,7 @@ # Rules to configure and make the package. compile_rules() { - cd $src + sed -i 's|/usr/doc|/usr/share/doc|' configure* ./configure --prefix=/usr --infodir=/usr/share/info \ --disable-sdltest --mandir=/usr/share/man $CONFIGURE_ARGS && make && @@ -30,6 +30,7 @@ mkdir -p $fs/usr cp -a $install/usr/bin $fs/usr cp -a $install/usr/share $fs/usr + rm -rf $fs/usr/share/doc cp -a stuff/* $fs } diff -r f6af821600e6 -r e8c84b81fa04 lm-sensors/receipt --- a/lm-sensors/receipt Wed Jul 06 10:06:06 2016 +0200 +++ b/lm-sensors/receipt Wed Jul 06 12:08:46 2016 +0200 @@ -18,7 +18,7 @@ # Rules to configure and make the package. compile_rules() { - cd $src + sed -i 's|/man|/share&|' Makefile patch -p0 < $stuff/linux-3.0.patch && make PREFIX=/usr PROG_EXTRA=sensord DESTDIR=$DESTDIR install 2>&1 | \ sed 's/d: No such file/d: no such file/' diff -r f6af821600e6 -r e8c84b81fa04 logrotate/receipt --- a/logrotate/receipt Wed Jul 06 10:06:06 2016 +0200 +++ b/logrotate/receipt Wed Jul 06 12:08:46 2016 +0200 @@ -17,8 +17,7 @@ # Rules to configure and make the package. compile_rules() { - cd $src - make && make PREFIX=$DESTDIR install + make && make PREFIX=$DESTDIR MANDIR=/usr/share/man install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r f6af821600e6 -r e8c84b81fa04 magicrescue/receipt --- a/magicrescue/receipt Wed Jul 06 10:06:06 2016 +0200 +++ b/magicrescue/receipt Wed Jul 06 12:08:46 2016 +0200 @@ -15,7 +15,7 @@ # Rules to configure and make the package. compile_rules() { - cd $src + sed -i 's|/man/|/share&|' Makefile* install -d $DESTDIR/usr ./configure \ --prefix=/usr \ @@ -30,4 +30,3 @@ cp -a $install/usr/bin $fs/usr cp -a $install/usr/share/magicrescue $fs/usr/share } - diff -r f6af821600e6 -r e8c84b81fa04 mgetty/receipt --- a/mgetty/receipt Wed Jul 06 10:06:06 2016 +0200 +++ b/mgetty/receipt Wed Jul 06 12:08:46 2016 +0200 @@ -23,14 +23,17 @@ sed -i -e "s|^prefix=/usr/local|prefix=/usr|" \ -e "s|^spool=/var/spool|spool=/var/spool|" \ -e "s|^CONFDIR=.*|CONFDIR=/etc/mgetty+sendfax|" \ + -e 's|/man/|/share&|' \ Makefile sed -i -e "s|^prefix=/usr/local|prefix=$DESTDIR/usr|" \ -e "s|^spool=/var/spool|spool=$DESTDIR/var/spool|" \ -e "s|^CONFDIR=.*|CONFDIR=$DESTDIR/etc/mgetty+sendfax|" \ + -e 's|/man/|/share&|' \ -e 's|^INSTALL=install .*|INSTALL=install -c -o root -g root|' \ Makefile.install make bin-all vgetty - mkdir -p $DESTDIR/var/spool $DESTDIR/usr/man/man1 + mkdir -p $DESTDIR/var/spool $DESTDIR/usr/share/man/man1 \ + $DESTDIR/usr/share/man/man8 mv -f Makefile.install Makefile sed -i 's|chown|echo chown|' Makefile fax/Makefile make -k install.bin vgetty-install