From 3ae36d1c7fc9787e335c29075cbae5326575b2c3 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@frugalware.org>
Date: Fri, 4 Jan 2008 17:17:39 +0100
Subject: Merge branch 'pacman-g2'

Conflicts:

	Makefile
	pre-install.d/50uncommitted-changes

Additinoal fix:

As noted by Joey, we should bail out with an error if git commit fails when
using pacman-g2.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 23cb3ea..47cc3c9 100644
--- a/Makefile
+++ b/Makefile
@@ -13,3 +13,6 @@ install:
 ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),apt))
 	install -m 0644 -D apt.conf $(PREFIX)/etc/apt/apt.conf.d/05etckeeper
 endif
+ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),pacman-g2))
+	install -m 0644 -D pacman-g2.hook $(PREFIX)/etc/pacman-g2/hooks/etckeeper
+endif
-- 
cgit v1.2.3