fixed variable naming issues etc

Makefile

@@ -81,6 +81,7 @@ define docker-up
 endef
 
 define fpm-debian-build =
+    echo "Running fpm-debian-build"
  	PKG_ARCH=$1 && \
 	WORKDIR=$$(mktemp -dt "$$(basename $$0).XXXXXXXXXX") && \
 	INSTALLER_RESOURCES=./installer-resources/linux && \
@@ -95,7 +96,7 @@ define fpm-debian-build =
 	cp $$INSTALLER_RESOURCES/deb-copyright $$WORKDIR/usr/share/doc/lantern/copyright && \
 	cp $$INSTALLER_RESOURCES/lantern.desktop $$WORKDIR/usr/share/applications && \
 	cp $$INSTALLER_RESOURCES/icon128x128on.png $$WORKDIR/usr/share/icons/hicolor/128x128/apps/lantern.png && \
-	echo $$MANOTO > $$INSTALLER_RESOURCES/$$PACKAGED_YAML && \
+	echo $(MANOTO) > $$WORKDIR/usr/lib/lantern/$(PACKAGED_YAML) && \
 	\
 	cp lantern_linux_$$PKG_ARCH $$WORKDIR/usr/lib/lantern/lantern-binary && \
 	cp $$INSTALLER_RESOURCES/lantern.sh $$WORKDIR/usr/lib/lantern && \
@@ -198,7 +199,7 @@ docker-package-windows: require-version docker-windows-386
 	if [[ -z "$$BNS_CERT_PASS" ]]; then echo "BNS_CERT_PASS environment value is required."; exit 1; fi && \
 	INSTALLER_RESOURCES="installer-resources/windows" && \
 	osslsigncode sign -pkcs12 "$$BNS_CERT" -pass "$$BNS_CERT_PASS" -in "lantern_windows_386.exe" -out "$$INSTALLER_RESOURCES/lantern.exe" && \
-	echo $$MANOTO > $$INSTALLER_RESOURCES/$$PACKAGED_YAML && \
+	echo $(MANOTO) > $$INSTALLER_RESOURCES/$(PACKAGED_YAML) && \
 	makensis -V1 -DVERSION=$$VERSION installer-resources/windows/lantern.nsi && \
 	osslsigncode sign -pkcs12 "$$BNS_CERT" -pass "$$BNS_CERT_PASS" -in "$$INSTALLER_RESOURCES/lantern-installer-unsigned.exe" -out "lantern-installer.exe";
 
@@ -303,12 +304,12 @@ darwin-amd64: require-assets
 package-linux-386: require-version genassets linux-386
 	@echo "Generating distribution package for linux/386..." && \
 	$(call docker-up) && \
-	docker run -v $$PWD:/lantern -t $(DOCKER_IMAGE_TAG) /bin/bash -c 'cd /lantern && VERSION="'$$VERSION'" MANOTO="'$$MANOTO'" make docker-package-linux-386'
+	docker run -v $$PWD:/lantern -t $(DOCKER_IMAGE_TAG) /bin/bash -c 'cd /lantern && VERSION="'$$VERSION'" MANOTO="$(MANOTO)" make docker-package-linux-386'
 
 package-linux-amd64: require-version genassets linux-amd64
 	@echo "Generating distribution package for linux/amd64..." && \
 	$(call docker-up) && \
-	docker run -v $$PWD:/lantern -t $(DOCKER_IMAGE_TAG) /bin/bash -c 'cd /lantern && VERSION="'$$VERSION'" MANOTO="'$$MANOTO'" make docker-package-linux-amd64'
+	docker run -v $$PWD:/lantern -t $(DOCKER_IMAGE_TAG) /bin/bash -c 'cd /lantern && VERSION="'$$VERSION'" MANOTO="$(MANOTO)" make docker-package-linux-amd64'
 
 package-linux-arm: require-version genassets linux-arm
 	@echo "Generating distribution package for linux/arm..." && \
@@ -333,7 +334,7 @@ package-darwin: require-version require-appdmg require-svgexport darwin
 		cp -r $$INSTALLER_RESOURCES/Lantern.app_template Lantern.app && \
 		mkdir Lantern.app/Contents/MacOS && \
 		cp -r lantern_darwin_amd64 Lantern.app/Contents/MacOS/lantern && \
-		echo $$MANOTO > Lantern.app/Contents/Resources/$$PACKAGED_YAML && \
+		echo $(MANOTO) > Lantern.app/Contents/Resources/$(PACKAGED_YAML) && \
 		codesign -s "Developer ID Application: Brave New Software Project, Inc" Lantern.app && \
 		rm -rf Lantern.dmg && \
 		sed "s/__VERSION__/$$VERSION/g" $$INSTALLER_RESOURCES/dmgbackground.svg > $$INSTALLER_RESOURCES/dmgbackground_versioned.svg && \
@@ -354,10 +355,10 @@ manoto-packages: manoto packages
 
 package-windows-manoto: manoto package-windows
 package-darwin-manoto: manoto package-darwin
-package-linux-manoto: manoto package-darwin
+package-linux-manoto: manoto package-linux
 
 manoto: 
-	$(eval MANOTO := startupurl: https:///www.facebook.com/manototv)
+	$(eval MANOTO := startupurl: https://www.facebook.com/manototv)
 
 
 release-qa: require-version require-s3cmd