diff options
-rwxr-xr-x | app/crypt/gnupg2/gnupg2.SlackBuild | 14 | ||||
-rwxr-xr-x | app/crypt/pgpdump/pgpdump.SlackBuild | 10 | ||||
-rwxr-xr-x | dev/libs/libassuan/libassuan.SlackBuild | 11 | ||||
-rwxr-xr-x | dev/libs/libgcrypt/libgcrypt.SlackBuild | 11 | ||||
-rwxr-xr-x | dev/libs/libgpg-error/libgpg-error.SlackBuild | 10 | ||||
-rwxr-xr-x | dev/libs/libksba/libksba.SlackBuild | 11 | ||||
-rwxr-xr-x | dev/libs/libpth/libpth.SlackBuild | 11 | ||||
-rwxr-xr-x | net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild | 6 | ||||
-rwxr-xr-x | sci/electronics/gtkwave/gtkwave.SlackBuild | 10 | ||||
-rwxr-xr-x | sci/electronics/iverilog/iverilog.SlackBuild | 12 | ||||
-rwxr-xr-x | sci/electronics/ivi/ivi.SlackBuild | 12 | ||||
-rwxr-xr-x | sys/apps/microcode_ctl/microcode_ctl.SlackBuild | 8 |
12 files changed, 72 insertions, 54 deletions
diff --git a/app/crypt/gnupg2/gnupg2.SlackBuild b/app/crypt/gnupg2/gnupg2.SlackBuild index dbfaaeba..255e6474 100755 --- a/app/crypt/gnupg2/gnupg2.SlackBuild +++ b/app/crypt/gnupg2/gnupg2.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=--infodir=$PREFIX/info --mandir=$PREFIX/man --enable-static-rnd=linux --enable-noexecstack} +NUMJOBS=${NUMJOBS:=-j4} # Set system libraries' path and optmization flags based on $ARCH LIBDIR="$PREFIX/lib" @@ -100,12 +102,10 @@ cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix="$PREFIX" --libdir="$LIBDIR" \ - --infodir="$PREFIX/info" --mandir="$PREFIX/man" \ - --enable-static-rnd=linux --enable-noexecstack || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE # Install make install DESTDIR="$PKG" || exit $ERROR_INSTALL @@ -151,9 +151,9 @@ fi DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README* THANKS TODO \ VERSION doc/DETAILS doc/HACKING doc/KEYSERVER doc/OpenPGP doc/TRANSLATE \ doc/examples doc/*.png" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" -( cd "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" +( cd "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" ln -sf "$PREFIX/share/$PKG_NAME/FAQ" . ln -sf "$PREFIX/share/$PKG_NAME/faq.html" . ) diff --git a/app/crypt/pgpdump/pgpdump.SlackBuild b/app/crypt/pgpdump/pgpdump.SlackBuild index ee981fa9..fcee4bc2 100755 --- a/app/crypt/pgpdump/pgpdump.SlackBuild +++ b/app/crypt/pgpdump/pgpdump.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=} +NUMJOBS=${NUMJOBS:=-j4} # Set system optmization flags based on $ARCH if [ "$ARCH" = "i386" ]; then @@ -70,10 +72,10 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA cd "$PKG_SRC" # Configure -CFLAGS="$SLKCFLAGS" ./configure || exit $ERROR_CONF +CFLAGS="$SLKCFLAGS" ./configure "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE # Install mkdir -p "$PKG/$PREFIX/bin" "$PKG/$PREFIX/man/man1" || exit $ERROR_MKDIR @@ -104,8 +106,8 @@ fi # Install documentation DOCS="CHANGES COPYRIGHT README" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR diff --git a/dev/libs/libassuan/libassuan.SlackBuild b/dev/libs/libassuan/libassuan.SlackBuild index b5b470fd..b8debda3 100755 --- a/dev/libs/libassuan/libassuan.SlackBuild +++ b/dev/libs/libassuan/libassuan.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=--infodir=$PREFIX/info} +NUMJOBS=${NUMJOBS:=-j4} # Set system libraries' path and optmization flags based on $ARCH LIBDIR="$PREFIX/lib" @@ -100,11 +102,10 @@ cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix="$PREFIX" --libdir="$LIBDIR" \ - --infodir="$PREFIX/info" || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE # Install make install DESTDIR="$PKG" || exit $ERROR_INSTALL @@ -127,8 +128,8 @@ fi # Install documentation DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README* THANKS TODO VERSION" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR diff --git a/dev/libs/libgcrypt/libgcrypt.SlackBuild b/dev/libs/libgcrypt/libgcrypt.SlackBuild index 4290ba10..fed2828c 100755 --- a/dev/libs/libgcrypt/libgcrypt.SlackBuild +++ b/dev/libs/libgcrypt/libgcrypt.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=--infodir=$PREFIX/info --enable-m-guard --enable-noexecstack} +NUMJOBS=${NUMJOBS:=-j4} # Set system libraries' path and optmization flags based on $ARCH LIBDIR="$PREFIX/lib" @@ -100,11 +102,10 @@ cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix="$PREFIX" --libdir="$LIBDIR" --infodir="$PREFIX/info" \ - --enable-m-guard --enable-noexecstack || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE # Install make install DESTDIR="$PKG" || exit $ERROR_INSTALL @@ -127,8 +128,8 @@ fi # Install documentation DOCS="AUTHORS BUGS COPYING* ChangeLog INSTALL NEWS README* THANKS TODO VERSION" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR diff --git a/dev/libs/libgpg-error/libgpg-error.SlackBuild b/dev/libs/libgpg-error/libgpg-error.SlackBuild index be3101aa..36d00f66 100755 --- a/dev/libs/libgpg-error/libgpg-error.SlackBuild +++ b/dev/libs/libgpg-error/libgpg-error.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=} +NUMJOBS=${NUMJOBS:=-j4} # Set system libraries' path and optmization flags based on $ARCH LIBDIR="$PREFIX/lib" @@ -100,10 +102,10 @@ cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix="$PREFIX" --libdir="$LIBDIR" || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE # Install make install DESTDIR="$PKG" || exit $ERROR_INSTALL @@ -118,8 +120,8 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL # Install documentation DOCS="ABOUT-NLS AUTHORS ChangeLog COPYING* INSTALL NEWS README" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR diff --git a/dev/libs/libksba/libksba.SlackBuild b/dev/libs/libksba/libksba.SlackBuild index 595c272c..e0f817d6 100755 --- a/dev/libs/libksba/libksba.SlackBuild +++ b/dev/libs/libksba/libksba.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=--infodir=$PREFIX/info} +NUMJOBS=${NUMJOBS:=-j4} # Set system libraries' path and optmization flags based on $ARCH LIBDIR="$PREFIX/lib" @@ -100,11 +102,10 @@ cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix="$PREFIX" --libdir="$LIBDIR" \ - --infodir="$PREFIX/info" || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE # Install make install DESTDIR="$PKG" || exit $ERROR_INSTALL @@ -127,8 +128,8 @@ fi # Install documentation DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR diff --git a/dev/libs/libpth/libpth.SlackBuild b/dev/libs/libpth/libpth.SlackBuild index 9edaeac8..ec34463c 100755 --- a/dev/libs/libpth/libpth.SlackBuild +++ b/dev/libs/libpth/libpth.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=--mandir=$PREFIX/man} +NUMJOBS=${NUMJOBS:=-j4} # Set system libraries' path and optmization flags based on $ARCH LIBDIR="$PREFIX/lib" @@ -117,11 +119,10 @@ cd "$PKG_SRC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ - --prefix="$PREFIX" --libdir="$LIBDIR" \ - --mandir="$PREFIX/man" || exit $ERROR_CONF + --prefix="$PREFIX" --libdir="$LIBDIR" "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE make test # Install @@ -153,8 +154,8 @@ fi # Install documentation DOCS="ANNOUNCE AUTHORS COPYING ChangeLog HACKING HISTORY INSTALL NEWS PORTING \ README SUPPORT TESTS THANKS USERS" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR diff --git a/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild b/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild index f1145332..a53e1a66 100755 --- a/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild +++ b/net/firewall/arno-iptables-firewall/arno-iptables-firewall.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/${SRC_NAME}_$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=} +NUMJOBS=${NUMJOBS:=-j4} # Set error codes (used by createpkg) ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33 @@ -91,8 +93,8 @@ fi # Install documentation DOCS="CHANGELOG README gpl_license.txt" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR diff --git a/sci/electronics/gtkwave/gtkwave.SlackBuild b/sci/electronics/gtkwave/gtkwave.SlackBuild index 44ee6013..0bf03e60 100755 --- a/sci/electronics/gtkwave/gtkwave.SlackBuild +++ b/sci/electronics/gtkwave/gtkwave.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=} +NUMJOBS=${NUMJOBS:=-j4} # Set error codes (used by createpkg) ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33 @@ -72,10 +74,10 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA cd "$PKG_SRC" # Configure -echo $GTK_VERSION | ./configure || exit $ERROR_CONF +echo $GTK_VERSION | ./configure "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE # Install make install prefix="$PKG/$PREFIX" || exit $ERROR_INSTALL @@ -105,8 +107,8 @@ fi # Install documentation DOCS="*.TXT doc/gtkwave.odt examples" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR diff --git a/sci/electronics/iverilog/iverilog.SlackBuild b/sci/electronics/iverilog/iverilog.SlackBuild index f502a471..979ce178 100755 --- a/sci/electronics/iverilog/iverilog.SlackBuild +++ b/sci/electronics/iverilog/iverilog.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=} +NUMJOBS=${NUMJOBS:=-j4} # Set system libraries' path and optmization flags based on $ARCH LIBDIR="$PREFIX/lib" @@ -75,10 +77,10 @@ cd "$PKG_SRC" # Configure CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ - ./configure || exit $ERROR_CONF + ./configure "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE # Install make install prefix="$PKG/$PREFIX" || exit $ERROR_INSTALL @@ -107,9 +109,9 @@ if [ -d "$PKG/$PREFIX/man" ]; then fi # Install documentation -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION/vvp" || exit $ERROR_MKDIR -cp -a COPYING INSTALL *.txt examples "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" -cp -a vvp/*.txt vvp/examples "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION/vvp" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION/vvp" || exit $ERROR_MKDIR +cp -a COPYING INSTALL *.txt examples "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" +cp -a vvp/*.txt vvp/examples "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION/vvp" # Add package description (slack-desc) mkdir -p "$PKG/install" || exit $ERROR_MKDIR diff --git a/sci/electronics/ivi/ivi.SlackBuild b/sci/electronics/ivi/ivi.SlackBuild index 8fc95937..75501392 100755 --- a/sci/electronics/ivi/ivi.SlackBuild +++ b/sci/electronics/ivi/ivi.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=--enable-release} +NUMJOBS=${NUMJOBS:=-j4} # Set error codes (used by createpkg) ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33 @@ -69,10 +71,10 @@ for patch in $patches; do done # Configure -./configure --enable-release || exit $ERROR_CONF +./configure "$CONF_OPTIONS" || exit $ERROR_CONF # Compile -make || exit $ERROR_MAKE +make "$NUMJOBS" || exit $ERROR_MAKE # Install make install prefix="$PKG/$PREFIX/share/ivi" || exit $ERROR_INSTALL @@ -106,10 +108,10 @@ find "$PKG/$PREFIX/share/ivi/modules" -name "*.vpi" -exec chmod 755 {} \; # Install documentation DOCS="LIMITATIONS README *.txt" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" mv "$PKG/$PREFIX/share/ivi/doc/"{getting_started,ivi_commands} \ - "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" + "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" rmdir "$PKG/$PREFIX/share/ivi/doc" # Add package description (slack-desc) diff --git a/sys/apps/microcode_ctl/microcode_ctl.SlackBuild b/sys/apps/microcode_ctl/microcode_ctl.SlackBuild index 19698f93..c762d705 100755 --- a/sys/apps/microcode_ctl/microcode_ctl.SlackBuild +++ b/sys/apps/microcode_ctl/microcode_ctl.SlackBuild @@ -27,6 +27,8 @@ PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} PREFIX=${PREFIX:=/usr} PKG_SRC="$TMP/$SRC_NAME-$SRC_VERSION" +CONF_OPTIONS=${CONF_OPTIONS:=} +NUMJOBS=${NUMJOBS:=-j4} # Set error codes (used by createpkg) ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33 @@ -57,7 +59,7 @@ tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TA cd "$PKG_SRC" # Compile -make all || exit $ERROR_MAKE +make "$NUMJOBS" all || exit $ERROR_MAKE if [ ! -c /dev/cpu/microcode ]; then make device || exit $ERROR_MAKE fi @@ -90,8 +92,8 @@ fi # Install documentation DOCS="Changelog README intel-*.txt" -mkdir -p "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/$PREFIX/doc/$PKG_NAME-$PKG_VERSION" +mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR +cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" # Move the initialization script to /etc/rc.d/, renaming it to rc.* ( cd "$PKG/etc/rc.d" |