Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlad Wenter <alad@archlinux.info>2016-10-08 19:34:15 +0200
committerAndrew Gregory <andrew.gregory.8@gmail.com>2017-05-08 23:27:44 -0400
commit7bb1c73cfaf22d9f2dbc041dcd0114e6322fc89d (patch)
tree19f798ba60945d74e5d663c580aebead9b1f8fb5
parentc2aed8aaff7f092cb5ab5d5ce38a98e0ef1a6adc (diff)
libmakepkg: generate all scripts
In order for the scripts to be used in testsuites, it is easiest to generate all of them so they are found in the build directory (which may be different to the source directory). Signed-off-by: Alad Wenter <alad@archlinux.info> Signed-off-by: Allan McRae <allan@archlinux.org> (cherry picked from commit aca153bfa6b1bcd828f0b35db453bb9fea6a08bf)
-rw-r--r--scripts/Makefile.am17
-rw-r--r--scripts/libmakepkg/util/message.sh.in (renamed from scripts/libmakepkg/util/message.sh)0
-rw-r--r--scripts/libmakepkg/util/option.sh.in (renamed from scripts/libmakepkg/util/option.sh)0
-rw-r--r--scripts/libmakepkg/util/util.sh.in (renamed from scripts/libmakepkg/util/util.sh)0
-rw-r--r--scripts/po/POTFILES.in2
5 files changed, 10 insertions, 9 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 70f459e2..b83463e6 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,6 +1,10 @@
# enforce that all scripts have a --help and --version option
AUTOMAKE_OPTIONS = std-options
-AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = makepkg-wrapper
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = \
+ makepkg-wrapper \
+ pacman-db-upgrade-wrapper \
+ pacman-key-wrapper \
+ pkgdelta-wrapper
SUBDIRS = po
@@ -48,11 +52,6 @@ LIBMAKEPKGDIRS = \
tidy \
util
-LIBMAKEPKG = \
- libmakepkg/util/message.sh \
- libmakepkg/util/option.sh \
- libmakepkg/util/util.sh
-
LIBMAKEPKG_IN = \
libmakepkg/lint_package.sh \
libmakepkg/lint_package/build_references.sh \
@@ -93,11 +92,13 @@ LIBMAKEPKG_IN = \
libmakepkg/tidy/upx.sh \
libmakepkg/tidy/zipman.sh \
libmakepkg/util.sh \
+ libmakepkg/util/message.sh \
+ libmakepkg/util/option.sh \
libmakepkg/util/pkgbuild.sh \
- libmakepkg/util/source.sh
+ libmakepkg/util/source.sh \
+ libmakepkg/util/util.sh
LIBMAKEPKG_DIST = \
- $(LIBMAKEPKG) \
$(addsuffix .in, $(LIBMAKEPKG_IN))
COMPLETION_IN = \
diff --git a/scripts/libmakepkg/util/message.sh b/scripts/libmakepkg/util/message.sh.in
index 341ccf3f..341ccf3f 100644
--- a/scripts/libmakepkg/util/message.sh
+++ b/scripts/libmakepkg/util/message.sh.in
diff --git a/scripts/libmakepkg/util/option.sh b/scripts/libmakepkg/util/option.sh.in
index 54ba4740..54ba4740 100644
--- a/scripts/libmakepkg/util/option.sh
+++ b/scripts/libmakepkg/util/option.sh.in
diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh.in
index f9f1c200..f9f1c200 100644
--- a/scripts/libmakepkg/util/util.sh
+++ b/scripts/libmakepkg/util/util.sh.in
diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index 3ac5a438..36d61f78 100644
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@ -46,7 +46,7 @@ scripts/libmakepkg/tidy/staticlibs.sh.in
scripts/libmakepkg/tidy/strip.sh.in
scripts/libmakepkg/tidy/upx.sh.in
scripts/libmakepkg/tidy/zipman.sh.in
-scripts/libmakepkg/util/message.sh
+scripts/libmakepkg/util/message.sh.in
scripts/libmakepkg/util/source.sh.in
scripts/library/output_format.sh
scripts/library/parseopts.sh