1 files changed, 23 insertions, 24 deletions
diff --git a/system/rhash/rhash.SlackBuild b/system/rhash/rhash.SlackBuild
index df9e4dcec9..6e329f374a 100644
--- a/system/rhash/rhash.SlackBuild
+++ b/system/rhash/rhash.SlackBuild
@@ -32,7 +32,7 @@
 #      3 Мартъ 1878 – възстановѧване на Българиѧ, 3 Мартъ 1918 (40 г. по–късно) – победа надъ Русиѧ
 
 PRGNAM=rhash
-VERSION=${VERSION:-1.3.5}
+VERSION=${VERSION:-1.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,13 +42,12 @@ OPENSSL=${OPENSSL:-yes}
 # Shall we install static libraries?
 STATICLIB=${STATICLIB:-no}
 
-if [ "$OPENSSL" = "yes" ]; then
-  OPTCFLAGS="-DOPENSSL_RUNTIME -rdynamic"
-  OPTLDFLAGS="-ldl"
+if [ "$OPENSSL" != "yes" ]; then
+  ENABLEOSSL="--disable-openssl"
 fi
 
 if [ "$STATICLIB" = "yes" ]; then
-  INSTALLSTATICLIB="install-lib-static"
+  ENABLESTATICLIB="--enable-lib-static"
 fi
 
 CWD=$(pwd)
@@ -95,31 +94,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Export FLAGS
-export ADDCFLAGS="${SLKCFLAGS} -DUSE_GETTEXT ${OPTCFLAGS}"
-export ADDLDFLAGS="${OPTLDFLAGS}"
-
-# -DUSE_GETTEXT = internationalization support
-# Build and install program and locales
-make \
-  PREFIX=/usr \
-  MANDIR=/usr/man \
-  DESTDIR=$PKG \
-    install-shared install-gmo
-
-# Build and install headers, libraries (static and shared)
-make -C librhash \
-  PREFIX=/usr \
-  LIBDIR=/usr/lib${LIBDIRSUFFIX} \
-  DESTDIR=$PKG \
-    install-headers install-lib-shared $INSTALLSTATICLIB install-so-link
+if [ "$STATICLIB" = "yes" ]; then
+  echo "+=============================+"
+  echo "| STATIC LIBRARY ACTIVATED!!! |"
+  echo "+=============================+"
+fi
 
+# enable-gettext - internationalization support
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --enable-gettext \
+  $ENABLESTATICLIB \
+  $ENABLEOSSL \
+  --extra-cflags="${SLKCFLAGS} ${OPTCFLAGS}" \
+  --extra-ldflags="${OPTLDFLAGS}"
+
+make DESTDIR=$PKG install install-gmo install-lib-so-link
 # Don't clobber the default config
 mv -v $PKG/etc/rhashrc $PKG/etc/rhashrc.new
 
 # Copy docs
 mkdir -pv $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog COPYING README INSTALL $PKG/usr/doc/$PRGNAM-$VERSION/
+cp -a ChangeLog COPYING README INSTALL.md $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;