diff --git a/debian/patches/folder-update b/debian/patches/folder-update index ef13597..0145046 100644 --- a/debian/patches/folder-update +++ b/debian/patches/folder-update @@ -1,6 +1,6 @@ -Description: Update the folders in which Uronode is installed +Description: Correct the folders in which Uronode is installed Author: Dave Hibberd -Last-Update: 2021-01-27 +Last-Update: 2021-02-02 --- a/configure +++ b/configure @@ -15,13 +15,36 @@ Last-Update: 2021-01-27 -[ "$DATA_DIR" ] || DATA_DIR=/usr/local/share -[ "$MAN_DIR" ] || MAN_DIR=/usr/local/share/man -[ "$VAR_DIR" ] || VAR_DIR=/usr/local/var/lib/ax25 -+[ "$ETC_DIR" ] || ETC_DIR=debian/uronode/etc/ax25 -+[ "$SBIN_DIR" ] || SBIN_DIR=debian/uronode/usr/sbin -+[ "$BIN_DIR" ] || BIN_DIR=debian/uronode/usr/bin -+[ "$LIB_DIR" ] || LIB_DIR=debian/uronode/usr/lib -+[ "$DATA_DIR" ] || DATA_DIR=debian/uronode/usr/share -+[ "$MAN_DIR" ] || MAN_DIR=debian/uronode/usr/share/man -+[ "$VAR_DIR" ] || VAR_DIR=debian/uronode/var/lib/ax25 ++[ "$ETC_DIR" ] || ETC_DIR=/etc/ax25 ++[ "$SBIN_DIR" ] || SBIN_DIR=/usr/sbin ++[ "$BIN_DIR" ] || BIN_DIR=/usr/bin ++[ "$LIB_DIR" ] || LIB_DIR=/usr/lib ++[ "$DATA_DIR" ] || DATA_DIR=/usr/share ++[ "$MAN_DIR" ] || MAN_DIR=/usr/share/man ++[ "$VAR_DIR" ] || VAR_DIR=/var/lib/ax25 echo "Welcome to the configuration utility for URONode. This configure script" echo "will very simply and easily guide you into installling URONode with as" +--- a/Makefile.include.in ++++ b/Makefile.include.in +@@ -2,12 +2,12 @@ + ARCH = @ARCH@ + + # Paths +-ETC_DIR = @ETC_DIR@ +-SBIN_DIR = @SBIN_DIR@ +-BIN_DIR = @BIN_DIR@ +-LIB_DIR = @LIB_DIR@ +-MAN_DIR = @MAN_DIR@ +-VAR_DIR = @VAR_DIR@ ++ETC_DIR = debian/uronode@ETC_DIR@ ++SBIN_DIR = debian/uronode@SBIN_DIR@ ++BIN_DIR = debian/uronode@BIN_DIR@ ++LIB_DIR = debian/uronode@LIB_DIR@ ++MAN_DIR = debian/uronode@MAN_DIR@ ++VAR_DIR = debian/uronode@VAR_DIR@ + + # Is Zlib available? +-ZLIB = @ZLIB@ +\ No newline at end of file ++ZLIB = @ZLIB@