X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=Makefile.in;h=39e027b374ebfe25113dea2591ddf7d360302334;hb=ec8527028003cd9bd8170b5aa3f8ba63020487d3;hp=a3ef699943fb636138ff32bd426f75dea7155b2b;hpb=cc9254b17cbfe044120d58053212eb9983631c11;p=mmh diff --git a/Makefile.in b/Makefile.in index a3ef699..39e027b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,6 +9,7 @@ SHELL = /bin/sh @SET_MAKE@ srcdir = @srcdir@ +abs_srcdir = @abs_srcdir@ VPATH = @srcdir@ # ========== USER CONFIGURATION SECTION ========== @@ -32,6 +33,9 @@ etcdir = @sysconfdir@ # location of man pages mandir = @mandir@ +# RPM build root +rpmdir = @rpmdir@ + # location of incoming mail mailspool = @mailspool@ @@ -196,12 +200,15 @@ nmhrelease: cd $(ftpdir) && ln -s $(tarfile) nmh.tar.gz cd $(ftpdir) && md5sum *.gz > MD5SUM -# Create binary and source RPMs. Be care if using any existing build -# (make) products: it's usually a good idea to run make realclean first. -# _topdir puts build area in the RPM/ directory below the current one. -# _tmppath uses the specified local TMP. -rpm: all nmhdist - @rpmbuild --define '_topdir $(shell pwd)/RPM' \ +# Create binary and source RPMs. +# _topdir is the specified RPM build root. +# _tmppath is TMP below _topdir. +rpm: nmhdist + @test -d $(rpmdir)/SOURCES || mkdir -p $(rpmdir)/SOURCES + @test -d $(rpmdir)/SPECS || mkdir -p $(rpmdir)/SPECS + @mv -f $(tarfile) $(rpmdir)/SOURCES + @cp -p VERSION $(rpmdir)/SOURCES + @cp -p nmh.spec $(rpmdir)/SPECS + @rpmbuild --define '_topdir $(rpmdir)' \ --define '_tmppath %{_topdir}/TMP' \ - --define 'srcdir $(shell pwd)' \ - -ba nmh.spec + -ba $(rpmdir)/SPECS/nmh.spec