From 2ae2cd4eabb6b1e0b28cf977e4756b6293ea3f6c Mon Sep 17 00:00:00 2001 From: Devrim Gunduz Date: Wed, 14 Jan 2026 16:08:51 +0300 Subject: [PATCH] Stop relying on variable in extras Makefiles as well. Followup to 5aaea932e --- rpm/redhat/global/Makefile.global-extras | 30 +++++++++---------- .../global/Makefile.global-extras-testing | 30 +++++++++---------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/rpm/redhat/global/Makefile.global-extras b/rpm/redhat/global/Makefile.global-extras index 1efb5344f..90145350d 100644 --- a/rpm/redhat/global/Makefile.global-extras +++ b/rpm/redhat/global/Makefile.global-extras @@ -11,18 +11,18 @@ extrasbfsrpm: prep rpmbuild --define "_sourcedir ." --define "_specdir ." \ - --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg$(DIST).extras/SRPMS" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/BUILDROOT" \ + --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg.extras/SRPMS" \ + --define "_buildrootdir $(HOME)/pgdg.extras/BUILDROOT" \ --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ --define "_rpmdir ." --nodeps -bs $(SPECFILE) extrasbuild: prep rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/BUILDROOT" \ - --define "_builddir $(HOME)/pgdg$(DIST).extras/BUILD" \ - --define "_srcrpmdir $(HOME)/pgdg$(DIST).extras/SRPMS" \ - --define "_rpmdir $(HOME)/pgdg$(DIST).extras/RPMS/" \ + --define "_buildrootdir $(HOME)/pgdg.extras/BUILDROOT" \ + --define "_builddir $(HOME)/pgdg.extras/BUILD" \ + --define "_srcrpmdir $(HOME)/pgdg.extras/SRPMS" \ + --define "_rpmdir $(HOME)/pgdg.extras/RPMS/" \ --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ -bb $(SPECFILE) make extrasbfsrpm @@ -31,7 +31,7 @@ extrasrpm: prep rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(PWD)" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/BUILDROOT" \ + --define "_buildrootdir $(HOME)/pgdg.extras/BUILDROOT" \ --define "_srcrpmdir $(PWD)" \ --define "_rpmdir $(PWD)" \ --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ @@ -39,17 +39,17 @@ extrasrpm: prep extrasnoprepbuild: rpmbuild --define "_sourcedir ." --define "_specdir ." \ - --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg$(DIST).extras/SRPMS" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/BUILDROOT" \ + --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg.extras/SRPMS" \ + --define "_buildrootdir $(HOME)/pgdg.extras/BUILDROOT" \ --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ --define "_rpmdir ." --nodeps -bs $(SPECFILE) rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ - --define "_builddir $(HOME)/pgdg$(DIST).extras/BUILD" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/BUILDROOT" \ - --define "_srcrpmdir $(HOME)/pgdg$(DIST).extras/SRPMS" \ - --define "_rpmdir $(HOME)/pgdg$(DIST).extras/RPMS/" \ + --define "_builddir $(HOME)/pgdg.extras/BUILD" \ + --define "_buildrootdir $(HOME)/pgdg.extras/BUILDROOT" \ + --define "_srcrpmdir $(HOME)/pgdg.extras/SRPMS" \ + --define "_rpmdir $(HOME)/pgdg.extras/RPMS/" \ --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ -bb $(SPECFILE) @@ -57,7 +57,7 @@ extrasnopreprpm: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(PWD)" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/BUILDROOT" \ + --define "_buildrootdir $(HOME)/pgdg.extras/BUILDROOT" \ --define "_srcrpmdir $(PWD)" \ --define "_rpmdir $(PWD)" \ --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ @@ -66,7 +66,7 @@ extrasnopreprpm: extrasnoprepsrpm: rpmbuild --define "_sourcedir ." --define "_specdir ." \ --define "_builddir ." --define "_srcrpmdir ." \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extras/BUILDROOT" \ + --define "_buildrootdir $(HOME)/pgdg.extras/BUILDROOT" \ --define "pgmajorversion 18" --define "pginstdir /usr/pgsql-18" --define "pgpackageversion 18" \ --define "_rpmdir ." --nodeps -bs $(SPECFILE) diff --git a/rpm/redhat/global/Makefile.global-extras-testing b/rpm/redhat/global/Makefile.global-extras-testing index 86253d578..202cd5ec3 100644 --- a/rpm/redhat/global/Makefile.global-extras-testing +++ b/rpm/redhat/global/Makefile.global-extras-testing @@ -11,18 +11,18 @@ extrasbfsrpmtesting: prep rpmbuild --define "_sourcedir ." --define "_specdir ." \ - --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg$(DIST).extrastesting/SRPMS" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \ + --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg.extrastesting/SRPMS" \ + --define "_buildrootdir $(HOME)/pgdg.extrastesting/BUILDROOT" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "_rpmdir ." --nodeps -bs $(SPECFILE) extrasbuildtesting: prep rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \ - --define "_builddir $(HOME)/pgdg$(DIST).extrastesting/BUILD" \ - --define "_srcrpmdir $(HOME)/pgdg$(DIST).extrastesting/SRPMS" \ - --define "_rpmdir $(HOME)/pgdg$(DIST).extrastesting/RPMS/" \ + --define "_buildrootdir $(HOME)/pgdg.extrastesting/BUILDROOT" \ + --define "_builddir $(HOME)/pgdg.extrastesting/BUILD" \ + --define "_srcrpmdir $(HOME)/pgdg.extrastesting/SRPMS" \ + --define "_rpmdir $(HOME)/pgdg.extrastesting/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ -bb $(SPECFILE) make extrasbfsrpm @@ -31,7 +31,7 @@ extrasrpmtesting: prep rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(PWD)" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \ + --define "_buildrootdir $(HOME)/pgdg.extrastesting/BUILDROOT" \ --define "_srcrpmdir $(PWD)" \ --define "_rpmdir $(PWD)" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ @@ -39,17 +39,17 @@ extrasrpmtesting: prep extrasnoprepbuildtesting: rpmbuild --define "_sourcedir ." --define "_specdir ." \ - --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg$(DIST).extrastesting/SRPMS" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \ + --define "_builddir ." --define "_srcrpmdir $(HOME)/pgdg.extrastesting/SRPMS" \ + --define "_buildrootdir $(HOME)/pgdg.extrastesting/BUILDROOT" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "_rpmdir ." --nodeps -bs $(SPECFILE) rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ - --define "_builddir $(HOME)/pgdg$(DIST).extrastesting/BUILD" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \ - --define "_srcrpmdir $(HOME)/pgdg$(DIST).extrastesting/SRPMS" \ - --define "_rpmdir $(HOME)/pgdg$(DIST).extrastesting/RPMS/" \ + --define "_builddir $(HOME)/pgdg.extrastesting/BUILD" \ + --define "_buildrootdir $(HOME)/pgdg.extrastesting/BUILDROOT" \ + --define "_srcrpmdir $(HOME)/pgdg.extrastesting/SRPMS" \ + --define "_rpmdir $(HOME)/pgdg.extrastesting/RPMS/" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ -bb $(SPECFILE) @@ -57,7 +57,7 @@ extrasnopreprpmtesting: rpmbuild --define "_sourcedir $(PWD)" \ --define "_specdir $(PWD)" \ --define "_builddir $(PWD)" \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \ + --define "_buildrootdir $(HOME)/pgdg.extrastesting/BUILDROOT" \ --define "_srcrpmdir $(PWD)" \ --define "_rpmdir $(PWD)" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ @@ -66,7 +66,7 @@ extrasnopreprpmtesting: extrasnoprepsrpmtesting: rpmbuild --define "_sourcedir ." --define "_specdir ." \ --define "_builddir ." --define "_srcrpmdir ." \ - --define "_buildrootdir $(HOME)/pgdg$(DIST).extrastesting/BUILDROOT" \ + --define "_buildrootdir $(HOME)/pgdg.extrastesting/BUILDROOT" \ --define "pgmajorversion 17" --define "pginstdir /usr/pgsql-17" --define "pgpackageversion 17" \ --define "_rpmdir ." --nodeps -bs $(SPECFILE) -- 2.39.5