Updated Makefile

Author: gregswift

Makefile

@@ -6,18 +6,22 @@ RPMBUILD = rpmbuild --define "_topdir %(pwd)/build" \
 	--define "_srcrpmdir %{_rpmdir}" \
 	--define "_rpmdir %{_topdir}/rpms"
 INSTALLDIR=/etc/puppet/modules/${PACKAGE}
+BUILDDIR=build
+DISTDIR=${BUILDDIR}/sdist
+RPMBUILDDIR=${BUILDDIR}/rpm-build
+RPMDIR=${BUILDDIR}/rpms
 
 all: rpms
 
 clean:
-	rm -rf build/ *~
+	rm -rf ${BUILDDIR}/ *~
 
 install: 
 	mkdir -p ${INSTALLDIR}
 	cp -pr . ${INSTALLDIR}
 
 install_rpms: rpms 
-	rpm -Uvh build/rpms/noarch/${PACKAGE}*.noarch.rpm
+	rpm -Uvh ${RPMDIR}/${ARCH}/${PACKAGE}*.${ARCH}.rpm
 
 reinstall: uninstall install
 
@@ -28,17 +32,17 @@ uninstall_rpms: clean
 	rpm -e ${PACKAGE}
 
 sdist:
-	mkdir -p build/sdist/
-	tar -czf sdist/${PACKAGE}.tgz \
+	mkdir -p ${DISTDIR}
+	tar -czf ${DISTDIR}/${PACKAGE}.tgz \
 		--exclude ".git" --exclude "*.log" \
 		--exclude "Makefile" --exclude "README*" \
 		--exclude "*.spec" --exclude "build" \
 		./
 
 prep_rpmbuild: sdist
-	mkdir -p build/rpm-build
-	mkdir -p build/rpms
-	cp ${PACKAGE}.tgz build/rpm-build/
+	mkdir -p ${RPMBUILDDIR}
+	mkdir -p ${RPMDIR}
+	cp ${DISTDIR}/${PACKAGE}.tgz ${RPMBUILDDIR}/
 
 rpms: prep_rpmbuild
 	${RPMBUILD} -ba ${PACKAGE}.spec