rename datadir -> sharedir
abuild uses datadir as local variable in various functions. Rename the global datadir to sharedir to avoid confusion.
This commit is contained in:
parent
43fb2c012e
commit
f3dc428ea0
8
Makefile
8
Makefile
|
@ -5,7 +5,7 @@ VERSION := 3.4.0
|
||||||
prefix ?= /usr
|
prefix ?= /usr
|
||||||
bindir ?= $(prefix)/bin
|
bindir ?= $(prefix)/bin
|
||||||
sysconfdir ?= /etc
|
sysconfdir ?= /etc
|
||||||
datadir ?= $(prefix)/share/$(PACKAGE)
|
sharedir ?= $(prefix)/share/$(PACKAGE)
|
||||||
mandir ?= $(prefix)/share/man
|
mandir ?= $(prefix)/share/man
|
||||||
|
|
||||||
SCRIPTS := abuild abuild-keygen abuild-sign newapkbuild \
|
SCRIPTS := abuild abuild-keygen abuild-sign newapkbuild \
|
||||||
|
@ -36,7 +36,7 @@ LINK = $(CC) $(OBJS-$@) -o $@ $(LDFLAGS) $(LDFLAGS-$@) $(LIBS-$@)
|
||||||
SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g' \
|
SED_REPLACE := -e 's:@VERSION@:$(FULL_VERSION):g' \
|
||||||
-e 's:@prefix@:$(prefix):g' \
|
-e 's:@prefix@:$(prefix):g' \
|
||||||
-e 's:@sysconfdir@:$(sysconfdir):g' \
|
-e 's:@sysconfdir@:$(sysconfdir):g' \
|
||||||
-e 's:@datadir@:$(datadir):g' \
|
-e 's:@sharedir@:$(sharedir):g' \
|
||||||
|
|
||||||
SSL_CFLAGS ?= $(shell pkg-config --cflags openssl)
|
SSL_CFLAGS ?= $(shell pkg-config --cflags openssl)
|
||||||
SSL_LDFLAGS ?= $(shell pkg-config --cflags openssl)
|
SSL_LDFLAGS ?= $(shell pkg-config --cflags openssl)
|
||||||
|
@ -98,7 +98,7 @@ check: $(USR_BIN_FILE) functions.sh
|
||||||
|
|
||||||
install: $(USR_BIN_FILES) $(SAMPLES) abuild.conf functions.sh
|
install: $(USR_BIN_FILES) $(SAMPLES) abuild.conf functions.sh
|
||||||
install -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(sysconfdir) \
|
install -d $(DESTDIR)/$(bindir) $(DESTDIR)/$(sysconfdir) \
|
||||||
$(DESTDIR)/$(datadir) $(DESTDIR)/$(mandir)/man1 \
|
$(DESTDIR)/$(sharedir) $(DESTDIR)/$(mandir)/man1 \
|
||||||
$(DESTDIR)/$(mandir)/man5
|
$(DESTDIR)/$(mandir)/man5
|
||||||
for i in $(USR_BIN_FILES); do\
|
for i in $(USR_BIN_FILES); do\
|
||||||
install -m 755 $$i $(DESTDIR)/$(bindir)/$$i;\
|
install -m 755 $$i $(DESTDIR)/$(bindir)/$$i;\
|
||||||
|
@ -118,7 +118,7 @@ install: $(USR_BIN_FILES) $(SAMPLES) abuild.conf functions.sh
|
||||||
fi
|
fi
|
||||||
cp $(SAMPLES) $(DESTDIR)/$(prefix)/share/abuild/
|
cp $(SAMPLES) $(DESTDIR)/$(prefix)/share/abuild/
|
||||||
cp $(AUTOTOOLS_TOOLCHAIN_FILES) $(DESTDIR)/$(prefix)/share/abuild/
|
cp $(AUTOTOOLS_TOOLCHAIN_FILES) $(DESTDIR)/$(prefix)/share/abuild/
|
||||||
cp functions.sh $(DESTDIR)/$(datadir)/
|
cp functions.sh $(DESTDIR)/$(sharedir)/
|
||||||
|
|
||||||
.gitignore: Makefile
|
.gitignore: Makefile
|
||||||
echo "*.tar.bz2" > $@
|
echo "*.tar.bz2" > $@
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
datadir=@datadir@
|
sharedir=@sharedir@
|
||||||
|
|
||||||
if ! [ -f "$datadir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$datadir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
. "$datadir/functions.sh"
|
. "$sharedir/functions.sh"
|
||||||
|
|
||||||
|
|
||||||
# ask for privkey unless non-interactive mode
|
# ask for privkey unless non-interactive mode
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
datadir=@datadir@
|
sharedir=@sharedir@
|
||||||
|
|
||||||
if ! [ -f "$datadir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$datadir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
. "$datadir/functions.sh"
|
. "$sharedir/functions.sh"
|
||||||
|
|
||||||
do_sign() {
|
do_sign() {
|
||||||
local f i keyname repo
|
local f i keyname repo
|
||||||
|
|
12
abuild.in
12
abuild.in
|
@ -8,16 +8,16 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
datadir=@datadir@
|
sharedir=@sharedir@
|
||||||
|
|
||||||
abuild_path=$(readlink -f $0)
|
abuild_path=$(readlink -f $0)
|
||||||
git=$(command -v git) || git=true
|
git=$(command -v git) || git=true
|
||||||
|
|
||||||
if ! [ -f "$datadir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$datadir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
. "$datadir/functions.sh"
|
. "$sharedir/functions.sh"
|
||||||
|
|
||||||
# defaults
|
# defaults
|
||||||
: ${FAKEROOT:="fakeroot"}
|
: ${FAKEROOT:="fakeroot"}
|
||||||
|
@ -608,7 +608,7 @@ update_config_sub() {
|
||||||
find . -name config.sub | (local changed=false; while read f; do
|
find . -name config.sub | (local changed=false; while read f; do
|
||||||
if ! ./$f armv6-alpine-linux-muslgnueabihf 2>/dev/null; then
|
if ! ./$f armv6-alpine-linux-muslgnueabihf 2>/dev/null; then
|
||||||
msg "Updating $f"
|
msg "Updating $f"
|
||||||
cp "$datadir"/${f##*/} "$f" || return 1
|
cp "$sharedir"/${f##*/} "$f" || return 1
|
||||||
changed=true
|
changed=true
|
||||||
else
|
else
|
||||||
msg "No update needed for $f"
|
msg "No update needed for $f"
|
||||||
|
@ -623,7 +623,7 @@ update_config_guess() {
|
||||||
msg "No update needed for $f"
|
msg "No update needed for $f"
|
||||||
else
|
else
|
||||||
msg "Updating $f"
|
msg "Updating $f"
|
||||||
cp "$datadir"/${f##*/} "$f" || return 1
|
cp "$sharedir"/${f##*/} "$f" || return 1
|
||||||
changed=true
|
changed=true
|
||||||
fi
|
fi
|
||||||
done; $changed)
|
done; $changed)
|
||||||
|
|
8
abump.in
8
abump.in
|
@ -7,13 +7,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
datadir=@datadir@
|
sharedir=@sharedir@
|
||||||
|
|
||||||
if ! [ -f "$datadir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$datadir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
. "$datadir/functions.sh"
|
. "$sharedir/functions.sh"
|
||||||
|
|
||||||
: ${ABUILD:="abuild"}
|
: ${ABUILD:="abuild"}
|
||||||
|
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
datadir=@datadir@
|
sharedir=@sharedir@
|
||||||
|
|
||||||
if ! [ -f "$datadir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$datadir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
. "$datadir/functions.sh"
|
. "$sharedir/functions.sh"
|
||||||
|
|
||||||
|
|
||||||
show_plain() {
|
show_plain() {
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
sysconfdir=@sysconfdir@
|
sysconfdir=@sysconfdir@
|
||||||
abuildrepo=/var/lib/buildlab/result
|
abuildrepo=/var/lib/buildlab/result
|
||||||
datadir=@datadir@
|
sharedir=@sharedir@
|
||||||
|
|
||||||
BUILD_BASE="build-base"
|
BUILD_BASE="build-base"
|
||||||
SUDO=${SUDO:-"sudo"}
|
SUDO=${SUDO:-"sudo"}
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
datadir=@datadir@
|
sharedir=@sharedir@
|
||||||
|
|
||||||
if ! [ -f "$datadir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$datadir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
. "$datadir/functions.sh"
|
. "$sharedir/functions.sh"
|
||||||
|
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
|
|
|
@ -7,13 +7,13 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
program_version=@VERSION@
|
program_version=@VERSION@
|
||||||
datadir=@datadir@
|
sharedir=@sharedir@
|
||||||
|
|
||||||
if ! [ -f "$datadir/functions.sh" ]; then
|
if ! [ -f "$sharedir/functions.sh" ]; then
|
||||||
echo "$datadir/functions.sh: not found" >&2
|
echo "$sharedir/functions.sh: not found" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
. "$datadir/functions.sh"
|
. "$sharedir/functions.sh"
|
||||||
|
|
||||||
|
|
||||||
is_url() {
|
is_url() {
|
||||||
|
@ -246,10 +246,10 @@ newaport() {
|
||||||
|
|
||||||
# Copy init.d scripts if requested
|
# Copy init.d scripts if requested
|
||||||
if [ -n "$cpinitd" ]; then
|
if [ -n "$cpinitd" ]; then
|
||||||
cp "$datadir"/sample.initd $pkgname.initd
|
cp "$sharedir"/sample.initd $pkgname.initd
|
||||||
cp "$datadir"/sample.confd $pkgname.confd
|
cp "$sharedir"/sample.confd $pkgname.confd
|
||||||
cp "$datadir"/sample.pre-install $pkgname.pre-install
|
cp "$sharedir"/sample.pre-install $pkgname.pre-install
|
||||||
cp "$datadir"/sample.post-install $pkgname.post-install
|
cp "$sharedir"/sample.post-install $pkgname.post-install
|
||||||
install="\$pkgname.pre-install \$pkgname.post-install"
|
install="\$pkgname.pre-install \$pkgname.post-install"
|
||||||
source="$source
|
source="$source
|
||||||
$pkgname.initd
|
$pkgname.initd
|
||||||
|
|
Loading…
Reference in New Issue