From 044331da5b579a2f66b36924c4e24f32f5ce4299 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 9 Jun 2016 13:21:03 +0200
Subject: [PATCH] buildpkg: rename pkgarch.d -> make.conf.d

---
 Makefile                                      | 20 +++++++++----------
 data/{pkgarch.d => make.conf.d}/aarch64.conf  |  0
 data/{pkgarch.d => make.conf.d}/arm.conf      |  0
 data/{pkgarch.d => make.conf.d}/armv6h.conf   |  0
 data/{pkgarch.d => make.conf.d}/armv7h.conf   |  0
 data/{pkgarch.d => make.conf.d}/i686.conf     |  0
 data/{pkgarch.d => make.conf.d}/multilib.conf |  0
 data/{pkgarch.d => make.conf.d}/x86_64.conf   |  0
 lib/util.sh                                   |  2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename data/{pkgarch.d => make.conf.d}/aarch64.conf (100%)
 rename data/{pkgarch.d => make.conf.d}/arm.conf (100%)
 rename data/{pkgarch.d => make.conf.d}/armv6h.conf (100%)
 rename data/{pkgarch.d => make.conf.d}/armv7h.conf (100%)
 rename data/{pkgarch.d => make.conf.d}/i686.conf (100%)
 rename data/{pkgarch.d => make.conf.d}/multilib.conf (100%)
 rename data/{pkgarch.d => make.conf.d}/x86_64.conf (100%)

diff --git a/Makefile b/Makefile
index 21c88ad..9cf1202 100644
--- a/Makefile
+++ b/Makefile
@@ -29,13 +29,13 @@ SETS_PKG = \
 	data/pkg.d/default.set
 
 ARCH_CONF = \
-	data/pkgarch.d/i686.conf \
-	data/pkgarch.d/x86_64.conf \
-	data/pkgarch.d/multilib.conf \
-	data/pkgarch.d/aarch64.conf \
-	data/pkgarch.d/arm.conf \
-	data/pkgarch.d/armv6h.conf \
-	data/pkgarch.d/armv7h.conf
+	data/make.conf.d/i686.conf \
+	data/make.conf.d/x86_64.conf \
+	data/make.conf.d/multilib.conf \
+	data/make.conf.d/aarch64.conf \
+	data/make.conf.d/arm.conf \
+	data/make.conf.d/armv6h.conf \
+	data/make.conf.d/armv7h.conf
 
 BIN_PKG = \
 	bin/checkpkg \
@@ -143,8 +143,8 @@ install_pkg:
 	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d
 	install -m0644 ${SETS_PKG} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d
 
-	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkgarch.d
-	install -m0644 ${ARCH_CONF} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkgarch.d
+	install -dm0755 $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/make.conf.d
+	install -m0644 ${ARCH_CONF} $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/make.conf.d
 
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
 	install -m0755 ${BIN_PKG} $(DESTDIR)$(PREFIX)/bin
@@ -196,7 +196,7 @@ uninstall_base:
 
 uninstall_pkg:
 	for f in ${SETS_PKG}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkg.d/$$f; done
-	for f in ${ARCH_CONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/pkgarch.d/$$f; done
+	for f in ${ARCH_CONF}; do rm -f $(DESTDIR)$(SYSCONFDIR)/manjaro-tools/make.conf.d/$$f; done
 	for f in ${BIN_PKG}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	for f in ${SHARED_PKG}; do rm -f $(DESTDIR)$(PREFIX)/share/manjaro-tools/$$f; done
diff --git a/data/pkgarch.d/aarch64.conf b/data/make.conf.d/aarch64.conf
similarity index 100%
rename from data/pkgarch.d/aarch64.conf
rename to data/make.conf.d/aarch64.conf
diff --git a/data/pkgarch.d/arm.conf b/data/make.conf.d/arm.conf
similarity index 100%
rename from data/pkgarch.d/arm.conf
rename to data/make.conf.d/arm.conf
diff --git a/data/pkgarch.d/armv6h.conf b/data/make.conf.d/armv6h.conf
similarity index 100%
rename from data/pkgarch.d/armv6h.conf
rename to data/make.conf.d/armv6h.conf
diff --git a/data/pkgarch.d/armv7h.conf b/data/make.conf.d/armv7h.conf
similarity index 100%
rename from data/pkgarch.d/armv7h.conf
rename to data/make.conf.d/armv7h.conf
diff --git a/data/pkgarch.d/i686.conf b/data/make.conf.d/i686.conf
similarity index 100%
rename from data/pkgarch.d/i686.conf
rename to data/make.conf.d/i686.conf
diff --git a/data/pkgarch.d/multilib.conf b/data/make.conf.d/multilib.conf
similarity index 100%
rename from data/pkgarch.d/multilib.conf
rename to data/make.conf.d/multilib.conf
diff --git a/data/pkgarch.d/x86_64.conf b/data/make.conf.d/x86_64.conf
similarity index 100%
rename from data/pkgarch.d/x86_64.conf
rename to data/make.conf.d/x86_64.conf
diff --git a/lib/util.sh b/lib/util.sh
index fdca3ea..5e396a9 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -251,7 +251,7 @@ init_buildpkg(){
 
 	sets_dir_pkg="${SYSCONFDIR}/pkg.d"
 
-	pkgarch_dir="${SYSCONFDIR}/pkgarch.d"
+	pkgarch_dir="${SYSCONFDIR}/make.conf.d"
 
 	[[ -d ${USERCONFDIR}/pkg.d ]] && sets_dir_pkg=${USERCONFDIR}/pkg.d