From 6ae7041d377661018e3d5391129a876f53ec0b81 Mon Sep 17 00:00:00 2001
From: Tim Landscheidt <tim@tim-landscheidt.de>
Date: Apr 07 2025 22:28:11 +0000
Subject: Use $(pkgsysconfdir) instead of $(sysconfdir)/rpmdevtools


---

diff --git a/Makefile.am b/Makefile.am
index d55f397..cd9dcac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,11 +31,11 @@ sums = sum cksum sha1 sha224 sha256 sha384 sha512
 all: $(bin_SCRIPTS) $(man1_MANS) $(man8_MANS) $(bashcomp_DATA)
 
 %: %.in
-	$(SED) -e 's|__SYSCONFDIR__|$(sysconfdir)|g' $< > $@
+	$(SED) -e 's|__PKGSYSCONFDIR__|$(pkgsysconfdir)|g' $< > $@
 	case "$(bin_SCRIPTS)" in *$@*) chmod +x $@ ;; esac
 
 %: %.py
-	$(SED) -e 's|__SYSCONFDIR__|$(sysconfdir)|g' $< > $@
+	$(SED) -e 's|__PKGSYSCONFDIR__|$(pkgsysconfdir)|g' $< > $@
 	chmod +x $@
 
 rpmdev-spectool.1: rpmdev-spectool
diff --git a/rpmdev-newinit.in b/rpmdev-newinit.in
index 1ad7e33..26ef532 100644
--- a/rpmdev-newinit.in
+++ b/rpmdev-newinit.in
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-TEMPLATE=__SYSCONFDIR__/rpmdevtools/template.init
+TEMPLATE=__PKGSYSCONFDIR__/template.init
 DEFNAME=newinitscript.init
 
 version()
diff --git a/rpmdev-newspec.in b/rpmdev-newspec.in
index 27af10f..013e410 100644
--- a/rpmdev-newspec.in
+++ b/rpmdev-newspec.in
@@ -19,10 +19,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-SPECDIR=__SYSCONFDIR__/rpmdevtools
+SPECDIR=__PKGSYSCONFDIR__
 DEFTYPE=minimal
 DEFSPEC=newpackage.spec
-CONFIG=__SYSCONFDIR__/rpmdevtools/newspec.conf
+CONFIG=__PKGSYSCONFDIR__/newspec.conf
 
 # Don't load config at rpm build time so it won't affect the man page
 if [[ -z $RPM_BUILD_ROOT && -f $CONFIG ]] ; then
diff --git a/rpmdev-rmdevelrpms.py b/rpmdev-rmdevelrpms.py
index 18c1345..464a3a5 100755
--- a/rpmdev-rmdevelrpms.py
+++ b/rpmdev-rmdevelrpms.py
@@ -154,7 +154,7 @@ To include additional packages in the list of ones treated as development
 packages, use the "devpkgs" option in the configuration file.  To exclude
 packages from the list use "nondevpkgs" in it.  Exclusion overrides inclusion.
 
-The system wide configuration file is __SYSCONFDIR__/rpmdevtools/rmdevelrpms.conf,
+The system wide configuration file is __PKGSYSCONFDIR__/rmdevelrpms.conf,
 and per user settings (which override system ones) can be specified in
 ~/.config/rpmdevtools/rmdevelrpms.conf or ~/.rmdevelrpmsrc (deprecated).
 These files are written in Python.
@@ -263,7 +263,7 @@ def main():
         del ts
 
 
-for conf in ("__SYSCONFDIR__/rpmdevtools/rmdevelrpms.conf",
+for conf in ("__PKGSYSCONFDIR__/rmdevelrpms.conf",
              os.path.join(os.environ["HOME"], ".rmdevelrpmsrc"),  # deprecated
              os.path.join(os.environ["HOME"],
                           ".config/rpmdevtools/rmdevelrpms.conf")):