From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 4 Dec 2011 17:30:43 +0000 (+0100)
Subject: Remove hard configuration of architecture from pakfire.conf.
X-Git-Tag: 0.9.18~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5788a95360cf867cea9f2be1f30913eb883c0a24;p=pakfire.git

Remove hard configuration of architecture from pakfire.conf.
---

diff --git a/Makefile b/Makefile
index 4951cd12a..8dfc97fc2 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,9 @@ install: build
 
 	# Install example configuration.
 	-mkdir -pv $(DESTDIR)/etc/pakfire.repos.d
-	cp -vf examples/pakfire.conf $(DESTDIR)/etc/pakfire.conf
+	# Don't overwrite already installed configuration file.
+	[ -e "$(DESTDIR)/etc/pakfire.conf" ] || \
+		cp -vf examples/pakfire.conf $(DESTDIR)/etc/pakfire.conf
 	cp -vf examples/pakfire.repos.d/* $(DESTDIR)/etc/pakfire.repos.d/
 
 .PHONY: check
diff --git a/examples/pakfire.conf b/examples/pakfire.conf
index 5a07828df..72aba24c2 100644
--- a/examples/pakfire.conf
+++ b/examples/pakfire.conf
@@ -23,7 +23,6 @@ slogan = Gluttony
 
 maintainer = IPFire Development Team <developers@ipfire.org>
 vendor = ipfire
-arch = i686
 
 source_dl = http://source.ipfire.org/source-3.x/