[PATCH] rpm should work for version 3.x now (with changed RPMBUILD)

diff --git a/Makefile b/Makefile
index 04352f65e3c02c1255c98b9499b9e173060f9af3..3be1eed6b053a17411f08af8d87a2fd6aa298781 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -28,26 +28,28 @@ docsclean:
 depend:
        @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
 
+INSTALL = install
+prefix = /usr/local
+bindir = $(prefix)/bin
+RPMBUILD = rpmbuild
+TAR = tar
+
+export prefix INSTALL TAR
+
 dist: btrace.spec
        git-tar-tree HEAD btrace-1.0 > btrace-1.0.tar
        @mkdir -p btrace-1.0
        @cp btrace.spec btrace-1.0
-       @tar rf btrace-1.0.tar btrace-1.0/btrace.spec
+       $(TAR) rf btrace-1.0.tar btrace-1.0/btrace.spec
        @rm -rf btrace-1.0
        @bzip2 btrace-1.0.tar
 
 rpm: dist
-       rpmbuild -ta btrace-1.0.tar.bz2
+       $(RPMBUILD) -ta btrace-1.0.tar.bz2
 
 clean: docsclean
        -rm -f *.o $(PROGS) .depend btrace-1.0.tar.bz2
 
-INSTALL = install
-prefix = /usr/local
-bindir = $(prefix)/bin
-
-export prefix INSTALL
-
 install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)