diff options
| author | Alad Wenter <alad@archlinux.info> | 2016-10-08 19:34:15 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2016-10-22 20:50:28 +1000 |
| commit | aca153bfa6b1bcd828f0b35db453bb9fea6a08bf (patch) | |
| tree | 336ea9ce88241d65fd55f2affcabab439c9d1c76 | |
| parent | 8c55c0096c355e973ce6111cb25a1c4fa05953cf (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>
| -rw-r--r-- | scripts/Makefile.am | 17 | ||||
| -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.in | 2 |
5 files changed, 10 insertions, 9 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 92cd50cd..5d4fd29e 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 @@ -47,11 +51,6 @@ LIBMAKEPKGDIRS = \ tidy \ util -LIBMAKEPKG = \ - libmakepkg/util/message.sh \ - libmakepkg/util/option.sh \ - libmakepkg/util/util.sh - LIBMAKEPKG_IN = \ libmakepkg/integrity.sh \ libmakepkg/integrity/generate_checksum.sh \ @@ -96,11 +95,13 @@ LIBMAKEPKG_IN = \ libmakepkg/tidy/strip.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 b532d92a..4792bdfa 100644 --- a/scripts/po/POTFILES.in +++ b/scripts/po/POTFILES.in @@ -48,7 +48,7 @@ scripts/libmakepkg/tidy/purge.sh.in scripts/libmakepkg/tidy/staticlibs.sh.in scripts/libmakepkg/tidy/strip.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 |