From fab8c1a589b180e911e5f0c09eae6b495935bb6f Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 11 Jun 2020 14:17:08 +0200 Subject: [PATCH] scripts/build.sh: move deb specific variables to deb file --- scripts/build.sh | 3 --- scripts/build_deb.sh | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index d30f486..46a6798 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -15,9 +15,6 @@ set +o allexport # Directories. export PACKAGE_BINDIR=${PACKAGE_PREFIX}/bin export PACKAGE_ETCDIR=etc/${PACKAGE_NAME} -export PACKAGE_SYSUNITDIR=etc/systemd/system -export PACKAGE_RSYSLOGDIR=etc/rsyslog.d -export PACKAGE_LOGROTATEDIR=etc/logrotate.d export PACKAGE_LOGDIR=/var/log export PACKAGE_LOGFILE=${PACKAGE_LOGDIR}/${PACKAGE_NAME}.log export PACKAGE_SHAREDIR=${PACKAGE_PREFIX}/share/${PACKAGE_NAME} diff --git a/scripts/build_deb.sh b/scripts/build_deb.sh index 4a9bffd..d7a07f5 100755 --- a/scripts/build_deb.sh +++ b/scripts/build_deb.sh @@ -1,6 +1,9 @@ #!/usr/bin/env bash PACKAGE_TMPDIR="${PACKAGE_TMPDIR}/debian" +PACKAGE_SYSUNITDIR=etc/systemd/system +PACKAGE_RSYSLOGDIR=etc/rsyslog.d +PACKAGE_LOGROTATEDIR=etc/logrotate.d if [[ -f /etc/upstream-release/lsb-release ]]; then source /etc/upstream-release/lsb-release