bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Makefile adjustments for installation rules:

Browse source 
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:
Aaron Griffin 2006-12-19 07:39:44 +00:00
parent ff23064fa2
commit ef8fd03c33
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
etc/Makefile.am
View file

@ -1,3 +1,3 @@
SUBDIRS = pacman.d SUBDIRS = pacman.d abs
EXTRA_DIST = makepkg.conf pacman.conf EXTRA_DIST = makepkg.conf pacman.conf
dist_sysconf_DATA = makepkg.conf pacman.conf dist_sysconf_DATA = makepkg.conf pacman.conf

2
etc/pacman.d/Makefile.am
View file

@ -1,4 +1,4 @@
EXTRA_DIST = EXTRA_DIST = community current extra release unstable
install-data-hook: install-data-hook:
mkdir -p $(DESTDIR)$(sysconfdir)/pacman.d ; \ mkdir -p $(DESTDIR)$(sysconfdir)/pacman.d ; \

10
scripts/Makefile.am
View file

@ -1,2 +1,10 @@
AUTOMAKE_OPTIONS = std-options 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

8
scripts/makepkg
View file

@ -736,6 +736,10 @@ fi
# build # build
msg "Starting 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 if [ "x$LOGGING" = "1" ]; then
BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log" BUILDLOG="${startdir}/${pkgname}-${pkgver}-${pkgrel}-${CARCH}.log"
if [ -f "$BUILDLOG" ]; then if [ -f "$BUILDLOG" ]; then
@ -750,10 +754,6 @@ if [ "x$LOGGING" = "1" ]; then
mv "$BUILDLOG" "$BUILDLOG.$i" mv "$BUILDLOG" "$BUILDLOG.$i"
fi 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 #use 'errexit' to bail on syntax error
[ $set_e -eq 1 ] && set -e [ $set_e -eq 1 ] && set -e
build 2>&1 | tee "$BUILDLOG" build 2>&1 | tee "$BUILDLOG"