diff --git a/Makefile b/Makefile
index ac78a3e..45ceb58 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
-include defines.mk
 include /usr/share/dpkg/default.mk
 
+PACKAGE := libjs-framework7
+include defines.mk
+
 all: $(DEB)
 
 DEB=$(PACKAGE)_$(DEB_VERSION_UPSTREAM_REVISION)_all.deb
diff --git a/defines.mk b/defines.mk
index a1ab0e4..bd1ccbe 100644
--- a/defines.mk
+++ b/defines.mk
@@ -1,23 +1,21 @@
-PACKAGE := libjs-framework7
-
 PREFIX := /usr
-DATAROOTDIR := ${PREFIX}/share
-TARGETDIR := ${DATAROOTDIR}/javascript/framework7
-CSSDIR := ${DESTDIR}/${TARGETDIR}/css
-JSDIR := ${DESTDIR}/${TARGETDIR}/js
-FONTDIR := ${DESTDIR}/${TARGETDIR}/fonts
+DATAROOTDIR := $(PREFIX)/share
+TARGETDIR := $(DATAROOTDIR)/javascript/framework7
+CSSDIR := $(DESTDIR)/$(TARGETDIR)/css
+JSDIR := $(DESTDIR)/$(TARGETDIR)/js
+FONTDIR := $(DESTDIR)/$(TARGETDIR)/fonts
 
 F7DIR := framework7
 F7VER := 4.4.7
-F7URL := https://github.com/framework7io/framework7/releases/download/v${F7VER}/framework7.tar.gz
+F7URL := https://github.com/framework7io/framework7/releases/download/v$(F7VER)/framework7.tar.gz
 
 F7ICONSDIR := framework7-icons
 F7ICONSVER := 2.3.1
-F7ICONSURL := https://github.com/framework7io/framework7-icons/archive/v${F7ICONSVER}.tar.gz
+F7ICONSURL := https://github.com/framework7io/framework7-icons/archive/v$(F7ICONSVER).tar.gz
 
 MATERIALDIR := material-icons
 MATERIALVER := 3.0.1
-MATERIALURL := https://github.com/google/material-design-icons/raw/${MATERIALVER}/iconfont
+MATERIALURL := https://github.com/google/material-design-icons/raw/$(MATERIALVER)/iconfont
 
 MATERIALFONTS := MaterialIcons-Regular.ttf	\
 		 MaterialIcons-Regular.woff	\