diff --git a/Makefile.am b/Makefile.am
index d55270f..de190ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ SUBDIRS = ftk flaim sql xflaim
 
 rpms srcrpm:
 	for dir in $(SUBDIRS); do \
- 	  cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $@; \
+ 	  (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
 	done
 
 dist-hook:
diff --git a/flaim/Makefile.am b/flaim/Makefile.am
index 1475008..40f2d95 100644
--- a/flaim/Makefile.am
+++ b/flaim/Makefile.am
@@ -12,7 +12,7 @@ pkgconfig_DATA = libflaim.pc
 RPM = rpm
 
 rpms srcrpm: dist
-	cd obs && $(MAKE) $(AM_MAKEFLAGS) $@
+	(cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
 	rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
 	test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
 	rm -rf $(distdir)
diff --git a/flaim/obs/Makefile.am b/flaim/obs/Makefile.am
index b529c53..f0d255b 100644
--- a/flaim/obs/Makefile.am
+++ b/flaim/obs/Makefile.am
@@ -1,11 +1,11 @@
 rpmspec = $(PACKAGE_TARNAME).spec
 
 rpmmacros =\
- --define='_rpmdir $(PWD)'\
- --define='_srcrpmdir $(PWD)'\
- --define='_sourcedir $(PWD)'\
- --define='_specdir $(PWD)'\
- --define='_builddir $(PWD)'
+ --define='_rpmdir $(PWD)/..'\
+ --define='_srcrpmdir $(PWD)/..'\
+ --define='_sourcedir $(PWD)/..'\
+ --define='_specdir $(PWD)/..'\
+ --define='_builddir $(PWD)/..'
 
 rpmopts = --nodeps --buildroot='$(PWD)/_rpm'
 
diff --git a/ftk/Makefile.am b/ftk/Makefile.am
index 0eb10a4..2ce1732 100644
--- a/ftk/Makefile.am
+++ b/ftk/Makefile.am
@@ -16,7 +16,7 @@ pkgconfig_DATA = libflaimtk.pc
 RPM = rpm
 
 rpms srcrpm: dist
-	cd obs && $(MAKE) $(AM_MAKEFLAGS) $@
+	(cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
 	rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
 	test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
 	rm -rf $(distdir)
diff --git a/ftk/libflaimtk.pc.in b/ftk/libflaimtk.pc.in
new file mode 100644
index 0000000..6c5c7d9
--- /dev/null
+++ b/ftk/libflaimtk.pc.in
@@ -0,0 +1,9 @@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: FLAIM-Toolkit
+URL: http://forge.novell.com/modules/xfmod/project/?flaim
+Description: FLAIM system abstraction layer
+Version: @PACKAGE_VERSION@
+Libs: -lpthread -lrt -lstdc++ -ldl -lncurses -L${libdir} -lflaimtk
+Cflags: -I${includedir}
diff --git a/ftk/obs/Makefile.am b/ftk/obs/Makefile.am
index 40d95c9..440d67b 100644
--- a/ftk/obs/Makefile.am
+++ b/ftk/obs/Makefile.am
@@ -1,11 +1,11 @@
 rpmspec = $(PACKAGE_TARNAME).spec
 
 rpmmacros =\
- --define='_rpmdir $(PWD)'\
- --define='_srcrpmdir $(PWD)'\
- --define='_sourcedir $(PWD)'\
- --define='_specdir $(PWD)'\
- --define='_builddir $(PWD)'
+ --define='_rpmdir $(PWD)/..'\
+ --define='_srcrpmdir $(PWD)/..'\
+ --define='_sourcedir $(PWD)/..'\
+ --define='_specdir $(PWD)/..'\
+ --define='_builddir $(PWD)/..'
 
 rpmopts = --nodeps --buildroot='$(PWD)/_rpm'
 
diff --git a/sql/Makefile.am b/sql/Makefile.am
index f8ddb7b..93017c5 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -12,7 +12,7 @@ pkgconfig_DATA = libflaimsql.pc
 RPM = rpm
 
 rpms srcrpm: dist
-	cd obj && $(MAKE) $(AM_MAKEFLAGS) $@
+	(cd obj && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
 	rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
 	test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
 	rm -rf $(distdir)
diff --git a/sql/obs/Makefile.am b/sql/obs/Makefile.am
index 40d95c9..440d67b 100644
--- a/sql/obs/Makefile.am
+++ b/sql/obs/Makefile.am
@@ -1,11 +1,11 @@
 rpmspec = $(PACKAGE_TARNAME).spec
 
 rpmmacros =\
- --define='_rpmdir $(PWD)'\
- --define='_srcrpmdir $(PWD)'\
- --define='_sourcedir $(PWD)'\
- --define='_specdir $(PWD)'\
- --define='_builddir $(PWD)'
+ --define='_rpmdir $(PWD)/..'\
+ --define='_srcrpmdir $(PWD)/..'\
+ --define='_sourcedir $(PWD)/..'\
+ --define='_specdir $(PWD)/..'\
+ --define='_builddir $(PWD)/..'
 
 rpmopts = --nodeps --buildroot='$(PWD)/_rpm'
 
diff --git a/xflaim/Makefile.am b/xflaim/Makefile.am
index cc735de..c2e15f4 100644
--- a/xflaim/Makefile.am
+++ b/xflaim/Makefile.am
@@ -12,7 +12,7 @@ pkgconfig_DATA = libxflaim.pc
 RPM = rpm
 
 rpms srcrpm: dist
-	cd obs && $(MAKE) $(AM_MAKEFLAGS) $@
+	(cd obs && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1
 	rpmarch=`$(RPM) --showrc | grep "^build arch" | sed 's/\(.*: \)\(.*\)/\2/'`; \
 	test -z "$$rpmarch" || ( mv $$rpmarch/* .; rm -rf $$rpmarch )
 	rm -rf $(distdir)
diff --git a/xflaim/obs/Makefile.am b/xflaim/obs/Makefile.am
index 40d95c9..440d67b 100644
--- a/xflaim/obs/Makefile.am
+++ b/xflaim/obs/Makefile.am
@@ -1,11 +1,11 @@
 rpmspec = $(PACKAGE_TARNAME).spec
 
 rpmmacros =\
- --define='_rpmdir $(PWD)'\
- --define='_srcrpmdir $(PWD)'\
- --define='_sourcedir $(PWD)'\
- --define='_specdir $(PWD)'\
- --define='_builddir $(PWD)'
+ --define='_rpmdir $(PWD)/..'\
+ --define='_srcrpmdir $(PWD)/..'\
+ --define='_sourcedir $(PWD)/..'\
+ --define='_specdir $(PWD)/..'\
+ --define='_builddir $(PWD)/..'
 
 rpmopts = --nodeps --buildroot='$(PWD)/_rpm'