diff options
author | Alad Wenter <alad@archlinux.info> | 2016-10-10 10:47:38 +0200 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2016-10-22 12:50:54 +0200 |
commit | 1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee (patch) | |
tree | 209a9b9e48a558b8b75ff062e4f86d86cb29df95 /Makefile.am | |
parent | dfc78129be7acaa0ebe71fe407d63b5141c10150 (diff) | |
download | pacman-1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee.tar.gz pacman-1f8f0bd9ac4c11cdc1b9506f9f64d8192ecad4ee.tar.xz |
makepkg: Move parseopts from library to libmakepkg
parseopts is used in makepkg and other scripts such as pacman-key as a
getopt replacement.
Instead of including it in those scripts via a macro, move it to
libmakepkg/util/parseopts.sh and have scripts source this file where
appropriate.
To keep the parseopts test, a new variable was introduced:
PM_LIBMAKEPKG_DIR
Signed-off-by: Alad Wenter <alad@archlinux.info>
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f4ff187b..9fe3367a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,7 +39,8 @@ TEST_EXTENSIONS = .py AM_TESTS_ENVIRONMENT = \ PMTEST_UTIL_DIR=$(top_builddir)/src/util/; export PMTEST_UTIL_DIR; \ PMTEST_SCRIPT_DIR=$(top_builddir)/scripts/; export PMTEST_SCRIPT_DIR; \ - PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR; + PMTEST_SCRIPTLIB_DIR=$(top_srcdir)/scripts/library/; export PMTEST_SCRIPTLIB_DIR; \ + PMTEST_LIBMAKEPKG_DIR=$(top_builddir)/scripts/libmakepkg/; export PMTEST_LIBMAKEPKG_DIR; LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ $(top_srcdir)/build-aux/tap-driver.sh PY_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ |