Merge remote-tracking branch 'qubesos/pr/2'

* qubesos/pr/2:
  Fix parameter expansion for appmenus directory
  Whitelist APPMENUS_DIR setting
  Update in 'help' target for 'make clean' description

Makefile

@@ -34,7 +34,7 @@ TIMESTAMP := $(shell date -u +%Y%m%d%H%M)
 help:
 	@echo "make rpms                  -- generate template rpm"
 	@echo "make update-repo-installer -- copy newly generated rpm to installer repo"
-	@echo "make clean                 -- copy newly generated rpm to installer repo"
+	@echo "make clean                 -- remove all files and directories built or added"
 
 template-name:
 	@echo $(TEMPLATE_NAME)

qubeize_image

@@ -85,7 +85,7 @@ export INSTALLDIR=mnt
 # Create App Menus
 # ------------------------------------------------------------------------------
 echo "--> Choosing appmenus whitelists..."
-_appmenus_dir="${APPMENUS_DIR-${SCRIPTSDIR}}"
+_appmenus_dir="${APPMENUS_DIR:-${SCRIPTSDIR}}"
 rm -f appmenus
 if [ -d "${_appmenus_dir}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" ]; then
     ln -s "${_appmenus_dir}/appmenus_${DIST}_${TEMPLATE_FLAVOR}" appmenus