-# Create binary and source RPMs. Assumes that configure had already
-# been run. Otherwise, there wouldn't be a Makefile.
-# _topdir puts build area in the RPM/ directory below the current one.
-# _tmppath uses the specified local TMP.
-# srcdir is this current, top level nmh directory.
-# tarfile and version are as specified in this file. rpmbuild does
-# not allow Version to contain any dashes.
-rpm: all nmhdist
- @rpmbuild --define '_topdir '`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)' \