From ef8fd03c3310d3733a8b0b3cb8ccafbf8a8ff1ee Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Tue, 19 Dec 2006 07:39:44 +0000
Subject: 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

---
 etc/Makefile.am          |  2 +-
 etc/pacman.d/Makefile.am |  2 +-
 scripts/Makefile.am      | 10 +++++++++-
 scripts/makepkg          |  8 ++++----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/etc/Makefile.am b/etc/Makefile.am
index 7bfd83de..e53ada24 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = pacman.d
+SUBDIRS = pacman.d abs
 EXTRA_DIST = makepkg.conf pacman.conf
 dist_sysconf_DATA = makepkg.conf pacman.conf
diff --git a/etc/pacman.d/Makefile.am b/etc/pacman.d/Makefile.am
index 5d83f8f7..698af489 100644
--- a/etc/pacman.d/Makefile.am
+++ b/etc/pacman.d/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST = 
+EXTRA_DIST = community current extra release unstable
 
 install-data-hook:
 	mkdir -p $(DESTDIR)$(sysconfdir)/pacman.d ; \
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 9dfcc1ab..e28957bd 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -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
diff --git a/scripts/makepkg b/scripts/makepkg
index aa53990a..cec871e7 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -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"
-- 
cgit v1.2.3-70-g09d2