X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Fvzgot;a=blobdiff_plain;f=Makefile;h=b9bba9c15c1544e3644527c90a53971232bfae3f;hp=93c163122c33d7f7005f051249a160d081a16fe0;hb=HEAD;hpb=c4b3b8f694c902b7adb2c9b5a871bcde7b2c826f diff --git a/Makefile b/Makefile index 93c1631..b9bba9c 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,9 @@ fclean : clean $(MAKE) -s -C $$i clean ; \ done @ rm -fr $(RPMDIR)/SOURCES/$(APLR)*.tgz \ - $(APPNAME)*.src.rpm + $(APPNAME)*.src.rpm \ + $(APPNAME)*.*.x86_64.rpm \ + $(APPNAME)*.*.i386.rpm fdebug : @ $(MAKE) -s debug @@ -118,12 +120,12 @@ xtest : rpm rpm -Uhv ~safe/rpmbuild/RPMS/i586/$(APPNAME)*.i586.rpm test : binary - @ ssh $(TSTSYS).safe.ca \ + @ ssh safe@$(TSTSYS).safe.ca \ "rm -fr $(APPNAME)-*.x86_64.rpm" @ scp -q \ $(RPMDIR)/RPMS/x86_64/$(APPNAME)-*.x86_64.rpm \ - $(TSTSYS).safe.ca: - @ ssh -Y -t $(TSTSYS).safe.ca sudo \ + safe@$(TSTSYS).safe.ca: + @ ssh -Y -t safe@$(TSTSYS).safe.ca sudo \ rpm -Uhv ~safe/$(APPNAME)-*.x86_64.rpm binary : rpm @@ -166,7 +168,7 @@ rpm : @ mv $(APLR).tgz $(RPMDIR)/SOURCES @ rpmbuild -bs \ --quiet \ - --define "_topdir /home/safe/RPM" \ + --define "_topdir /home/jmp/RPM" \ support/$(APPNAME).spec > /dev/null 2>&1 @ mv $(RPMDIR)/SRPMS/$(APLR)*.src.rpm . @ echo "RPM src completed"