Remove hard configuration of architecture from pakfire.conf.

diff --git a/Makefile b/Makefile
index 4951cd12ac03f20ff506f2bf2adc897d349e0f9d..8dfc97fc2428275557656c377febf0e490a77493 100644 (file)
--- 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 5a07828dfff1aea5c3ba4e69f152f3c11462ef4e..72aba24c2aea475497fe3be900c1fe056bea5b2d 100644 (file)
--- 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/