Packaging bugfix

This commit is contained in:
Dave Hibberd 2015-10-16 20:04:57 +01:00
parent 5ed8addd5b
commit 37b01fe6d0
4 changed files with 41 additions and 7 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
uronode (2.3.1-3) UNRELEASED; urgency=medium
* Fix hardcoding temporary install directories into program binaries
-- Dave Hibberd <d@vehibberd.com> Fri, 16 Oct 2015 20:02:02 +0100
uronode (2.3.1-2) unstable; urgency=medium uronode (2.3.1-2) unstable; urgency=medium
* Team upload. * Team upload.

View File

@ -1,6 +1,6 @@
Description: Update the folders in which Uronode is installed Description: Update the folders in which Uronode is installed
Author: Dave Hibberd <d@vehibberd.com> Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2015-09-07 Last-Update: 2015-10-16
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@ -21,12 +21,12 @@ Last-Update: 2015-09-07
-LIB_DIR=/usr/local/lib -LIB_DIR=/usr/local/lib
-MAN_DIR=/usr/local/share/man -MAN_DIR=/usr/local/share/man
-VAR_DIR=/usr/local/var/ax25 -VAR_DIR=/usr/local/var/ax25
+ETC_DIR=debian/uronode/etc/ax25 +ETC_DIR=/etc/ax25
+SBIN_DIR=debian/uronode/usr/sbin +SBIN_DIR=/usr/sbin
+BIN_DIR=debian/uronode/usr/bin +BIN_DIR=/usr/bin
+LIB_DIR=debian/uronode/usr/lib +LIB_DIR=/usr/lib
+MAN_DIR=debian/uronode/usr/share/man +MAN_DIR=/usr/share/man
+VAR_DIR=debian/uronode/var/lib/ax25 +VAR_DIR=/var/lib/ax25
echo "Welcome to the configuration utility for URONode. This configure script" echo "Welcome to the configuration utility for URONode. This configure script"
echo "will very simply and easily guide you into installling URONode with as" echo "will very simply and easily guide you into installling URONode with as"

View File

@ -0,0 +1,27 @@
Description: Install files to temporary directory for packaging
Author: Dave Hibberd <d@vehibberd.com>
Last-Update: 2015-10-16
--- 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@

View File

@ -2,3 +2,4 @@ remove-cflags
folder-update folder-update
no-install-gz-manpages no-install-gz-manpages
install-dir-creation install-dir-creation
makefile-install-locations