Merge branch 'feature/upstream' into develop

1 files changed, 37 insertions, 37 deletions

diff --git a/Makefile.am b/Makefile.am
index 08cb451..14a999f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,8 @@ BUILDDIR = $(PKGDIR)/BUILD
 RSPEC = doc/$(PACKAGE).spec
 PNAME  = $(PACKAGE)-$(VERSION)
 TARDIR = /tmp/iu
-TMPDIR = $(TARDIR)/$(PNAME)
-BDIR = $(TMPDIR)-1-root
+TEMPDIR = $(TARDIR)/$(PNAME)
+BDIR = $(TEMPDIR)-1-root
 RPMB = rpmbuild
 # $(RPMB) -bb --buildroot $(BDIR) $(RSPEC)
 
@@ -25,48 +25,48 @@ rpm:	$(RSPEC)
 	$(RPMB) -bs  $(RSPEC)
 
 tarball:
-	rm -f $(TMPDIR)/../$(PNAME).tar.gz 
-	rm -rf $(TMPDIR)
-	mkdir -p $(TMPDIR)
-	find . -print | cpio -pdumv $(TMPDIR)
-	cd $(TMPDIR)/test; make clean; cd ..
-	cd $(TMPDIR)/hpiutil; make clean; cd ..
-	cd $(TMPDIR); make distclean
-	cd $(TMPDIR); rm -rf util/.deps lib/lanplus/.deps 
-	cd $(TMPDIR); rm -f lib/libipmiapi*.a* lib/libipmi*.a
-	cd $(TMPDIR); rm -rf autom4te.cache
-	cd $(TMPDIR); rm -f  util/events
-	cd $(TMPDIR); sed -i 's/\r//' ChangeLog AUTHORS COPYING NEWS README TODO doc/UserGuide
-	cd $(TMPDIR); chmod 644 doc/UserGuide
-	cd $(TMPDIR); rm -f  cprpm  debug*.list *~ .*.swp 
-	cd $(TMPDIR); find . -name '*.orig' -delete
-	cd $(TMPDIR); find . -name '*.rej' -delete
-	cd $(TMPDIR); cd ..; tar -czvf $(TARDIR)/$(PNAME).tar.gz $(PNAME)
+	rm -f $(TEMPDIR)/../$(PNAME).tar.gz 
+	rm -rf $(TEMPDIR)
+	mkdir -p $(TEMPDIR)
+	find . -print | cpio -pdumv $(TEMPDIR)
+	cd $(TEMPDIR)/test; make clean; cd ..
+	cd $(TEMPDIR)/hpiutil; make clean; cd ..
+	cd $(TEMPDIR); make distclean
+	cd $(TEMPDIR); rm -rf util/.deps lib/lanplus/.deps 
+	cd $(TEMPDIR); rm -f lib/libipmiapi*.a* lib/libipmi*.a
+	cd $(TEMPDIR); rm -rf autom4te.cache
+	cd $(TEMPDIR); rm -f  util/events
+	cd $(TEMPDIR); sed -i 's/\r//' ChangeLog AUTHORS COPYING NEWS README TODO doc/UserGuide
+	cd $(TEMPDIR); chmod 644 doc/UserGuide
+	cd $(TEMPDIR); rm -f  cprpm  debug*.list *~ .*.swp 
+	cd $(TEMPDIR); find . -name '*.orig' -delete
+	cd $(TEMPDIR); find . -name '*.rej' -delete
+	cd $(TEMPDIR); cd ..; tar -czvf $(TARDIR)/$(PNAME).tar.gz $(PNAME)
 	ls $(TARDIR)/*.gz
-	rm -rf $(TMPDIR)
-# chown -R root:root $(TMPDIR)
+	rm -rf $(TEMPDIR)
+# chown -R root:root $(TEMPDIR)
 
 tarsol:        util/ipmiutil
 	rm -f /tmp/$(PNAME)-solaris.tar
-	rm -rf $(TMPDIR)
-	mkdir -p $(TMPDIR)
-	cd util; cp ipmiutil idiscover ievents ipmi_port $(TMPDIR)
-	cd doc; cp UserGuide *.8 *.mib  $(TMPDIR)
-	cd scripts; cp checksel ipmiutil_??? *.sh $(TMPDIR)
-	cd $(TMPDIR); mv install-solaris.sh install.sh
-	cd $(TMPDIR); tar cvf /tmp/$(PNAME)-solaris.tar .
-	rm -rf $(TMPDIR)
+	rm -rf $(TEMPDIR)
+	mkdir -p $(TEMPDIR)
+	cd util; cp ipmiutil idiscover ievents ipmi_port $(TEMPDIR)
+	cd doc; cp UserGuide *.8 *.mib  $(TEMPDIR)
+	cd scripts; cp checksel ipmiutil_??? *.sh $(TEMPDIR)
+	cd $(TEMPDIR); mv install-solaris.sh install.sh
+	cd $(TEMPDIR); tar cvf /tmp/$(PNAME)-solaris.tar .
+	rm -rf $(TEMPDIR)
 
 tarbsd:        util/ipmiutil
 	rm -f /tmp/$(PNAME)-bsd.tar
-	rm -rf $(TMPDIR)
-	mkdir -p $(TMPDIR)
-	cd util; cp ipmiutil idiscover ievents ipmi_port $(TMPDIR)
-	cd doc; cp UserGuide *.8 *.mib  $(TMPDIR)
-	cd scripts; cp checksel ipmiutil_??? *.sh $(TMPDIR)
-	cd $(TMPDIR); mv install-solaris.sh install.sh
-	cd $(TMPDIR); tar -cvf /tmp/$(PNAME)-bsd.tar .
-	rm -rf $(TMPDIR)
+	rm -rf $(TEMPDIR)
+	mkdir -p $(TEMPDIR)
+	cd util; cp ipmiutil idiscover ievents ipmi_port $(TEMPDIR)
+	cd doc; cp UserGuide *.8 *.mib  $(TEMPDIR)
+	cd scripts; cp checksel ipmiutil_??? *.sh $(TEMPDIR)
+	cd $(TEMPDIR); mv install-solaris.sh install.sh
+	cd $(TEMPDIR); tar -cvf /tmp/$(PNAME)-bsd.tar .
+	rm -rf $(TEMPDIR)
 
 clean-generic:
 	rm -f *.log *.tmp debug*.list