Index: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in	(revision 57)
+++ trunk/Makefile.in	(revision 58)
@@ -882,6 +882,8 @@
 rpm-light: rpmspec-light distrpm
 	rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 
-	@echo "Searching the RPM package ..."; \
-	RPMFILE=`find /usr/src -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
+	@RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
+	if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
+	echo "Searching the RPM package below $$RPMTOP ..."; \
+	RPMFILE=`find $$RPMTOP -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
 	echo; \
 	if test x"$$RPMFILE" = x; then \
@@ -890,4 +892,5 @@
 	else \
 	  echo "Package $$RPMFILE built."; \
+	  echo "Copying it to ./$(PACKAGE)-$(VERSION).rpm"; \
 	  cp $$RPMFILE ./$(PACKAGE)-$(VERSION).rpm; \
 	fi; \
@@ -896,6 +899,8 @@
 rpm: rpmspec-full distrpm
 	rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 
-	@echo "Searching the RPM package ..."; \
-	RPMFILE=`find /usr/src -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
+	@RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
+	if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
+	echo "Searching the RPM package below $$RPMTOP ..."; \
+	RPMFILE=`find $$RPMTOP -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
 	echo; \
 	if test x"$$RPMFILE" = x; then \
@@ -904,4 +909,5 @@
 	else \
 	  echo "Package $$RPMFILE built."; \
+	  echo "Copying it to ./$(PACKAGE)-$(VERSION).rpm"; \
 	  cp $$RPMFILE ./$(PACKAGE)-$(VERSION).rpm; \
 	fi; \
Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 57)
+++ trunk/docs/Changelog	(revision 58)
@@ -1,3 +1,4 @@
 2.2.4:
+	* improve routine to find rpm after build
 	* add netbsd rc file from Brian Seklecki (taken from pkgsrc-wip)
 	* fix error in manual (location of lock file)