mirror of
https://github.com/moparisthebest/pacman
synced 2025-02-28 17:31:52 -05:00
Makefile adjustments for installation rules:
added all the newer scripts/ added pacman.d and abs sysconf subdirs Minor makepkg revert for previous change to 'errexit' shell option
This commit is contained in:
parent
ff23064fa2
commit
ef8fd03c33
@ -1,3 +1,3 @@
|
||||
SUBDIRS = pacman.d
|
||||
SUBDIRS = pacman.d abs
|
||||
EXTRA_DIST = makepkg.conf pacman.conf
|
||||
dist_sysconf_DATA = makepkg.conf pacman.conf
|
||||
|
@ -1,4 +1,4 @@
|
||||
EXTRA_DIST =
|
||||
EXTRA_DIST = community current extra release unstable
|
||||
|
||||
install-data-hook:
|
||||
mkdir -p $(DESTDIR)$(sysconfdir)/pacman.d ; \
|
||||
|
@ -1,2 +1,10 @@
|
||||
AUTOMAKE_OPTIONS = std-options
|
||||
bin_SCRIPTS = gensync makepkg makeworld updatesync pacman-optimize
|
||||
bin_SCRIPTS = gensync \
|
||||
makepkg \
|
||||
makeworld \
|
||||
updatesync \
|
||||
pacman-optimize \
|
||||
rankmirrors \
|
||||
abs \
|
||||
repo-add \
|
||||
re-pacman
|
||||
|
@ -736,6 +736,10 @@ fi
|
||||
# build
|
||||
msg "Starting build()..."
|
||||
|
||||
#check for "exit on syntax error" shell option
|
||||
echo $SHELLOPTS | grep errexit 2>&1 >/dev/null
|
||||
set_e=$?
|
||||
|
||||
if [ "x$LOGGING" = "1" ]; then
|
||||
BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log"
|
||||
if [ -f "$BUILDLOG" ]; then
|
||||
@ -750,10 +754,6 @@ if [ "x$LOGGING" = "1" ]; then
|
||||
mv "$BUILDLOG" "$BUILDLOG.$i"
|
||||
fi
|
||||
|
||||
#check for "exit on syntax error" shell option
|
||||
echo $SHELLOPTS | grep errexit 2>&1 >/dev/null
|
||||
set_e=$?
|
||||
|
||||
#use 'errexit' to bail on syntax error
|
||||
[ $set_e -eq 1 ] && set -e
|
||||
build 2>&1 | tee "$BUILDLOG"
|
||||
|
Loading…
x
Reference in New Issue
Block a user