diff options
| author | Allan McRae <allan@archlinux.org> | 2013-09-22 11:25:30 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-10-14 13:01:10 +1000 |
| commit | 31a55df3d9750b2cdb21d436c4bf3ffbf24c4f4d (patch) | |
| tree | b08af369319dd8cb9f38dce4fb7c377b74ee7330 | |
| parent | c9ab8a7f6c4d70672e2681f0e57d3298a2bdab7b (diff) | |
| download | pacman-31a55df3d9750b2cdb21d436c4bf3ffbf24c4f4d.tar.xz | |
makepkg: add LIBRARY variable
This points makepkg to where is library is located. Can be
overridden by value in the environment.
Signed-off-by: Allan McRae <allan@archlinux.org>
[Ashley: Rebased]
Signed-off-by: Ashley Whetter <ashley@awhetter.co.uk>
| -rw-r--r-- | scripts/Makefile.am | 3 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index f45065da..81307045 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -39,6 +39,8 @@ LIBRARY = \ # Files that should be removed, but which Automake does not know. MOSTLYCLEANFILES = $(bin_SCRIPTS) +libmakepkgdir = $(libdir)/makepkg + clean-local: $(AM_V_at)$(RM) -r .lib @@ -54,6 +56,7 @@ edit = sed \ -e 's|@localedir[@]|$(localedir)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ + -e 's|@libmakepkgdir[@]|$(libmakepkgdir)|g' \ -e 's|@pkgdatadir[@]|$(pkgdatadir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ -e '1s|!/bin/bash|!$(BASH_SHELL)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 9e2675db..2b01c468 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -46,6 +46,8 @@ declare -r confdir='@sysconfdir@' declare -r BUILDSCRIPT='@BUILDSCRIPT@' declare -r startdir="$PWD" +LIBRARY=${LIBRARY:-'@libmakepkgdir@'} + packaging_options=('strip' 'docs' 'libtool' 'staticlibs' 'emptydirs' 'zipman' \ 'purge' 'upx' 'debug') other_options=('ccache' 'distcc' 'buildflags' 'makeflags') |