Merge branch 'master' into devel
diff --git a/distro/config/apkg.toml b/distro/config/apkg.toml
index a11781e..203013e 100644
--- a/distro/config/apkg.toml
+++ b/distro/config/apkg.toml
@@ -1,10 +1,10 @@
[project]
name = "libyang"
-make_archive_script = "tools/make-dev-archive.sh"
+make_archive_script = "distro/scripts/make-archive.sh"
[upstream]
archive_url = "https://github.com/CESNET/libyang/archive/v{{ version }}.tar.gz"
-version_script = "tools/upstream-version.sh"
+version_script = "distro/scripts/upstream-version.sh"
[apkg]
compat = 1
diff --git a/tools/make-dev-archive.sh b/distro/scripts/make-archive.sh
similarity index 80%
rename from tools/make-dev-archive.sh
rename to distro/scripts/make-archive.sh
index ec3f7ae..9b6295d 100755
--- a/tools/make-dev-archive.sh
+++ b/distro/scripts/make-archive.sh
@@ -10,6 +10,8 @@
ARCHIVE=$NAMEVER.tar.gz
git archive --format tgz --output $ARCHIVE --prefix $NAMEVER/ HEAD
+mkdir -p pkg/archives/dev/
+mv $ARCHIVE pkg/archives/dev/
# apkg expects stdout to list archive files
-echo $ARCHIVE
+echo pkg/archives/dev/$ARCHIVE
diff --git a/tools/upstream-version.sh b/distro/scripts/upstream-version.sh
similarity index 100%
rename from tools/upstream-version.sh
rename to distro/scripts/upstream-version.sh