-# 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)' \