From 0b6926ea8f644aa1d5412784fd13c99cf69ab3b2 Mon Sep 17 00:00:00 2001
From: "Kali Kaneko (leap communications)" <kali@leap.se>
Date: Mon, 3 Oct 2016 18:16:40 -0400
Subject: [style] some minor naming changes; linting

---
 pkg/windows/Makefile   |  6 +++---
 pkg/windows/README.rst | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'pkg/windows')

diff --git a/pkg/windows/Makefile b/pkg/windows/Makefile
index 5d19353..c2494b4 100644
--- a/pkg/windows/Makefile
+++ b/pkg/windows/Makefile
@@ -1,9 +1,9 @@
 .PHONY: all pkg installer openvpn pyinstaller
 all:
 	docker-compose build
-	$(MAKE) pkg
+	$(MAKE) bundle
 
-pkg:
+bundle:
 	$(MAKE) openvpn
 	$(MAKE) pyinstaller
 	$(MAKE) installer
@@ -22,4 +22,4 @@ clean:
 	docker rmi windows_openvpn
 	docker rmi windows_installer
 	rm -rf ../../dist/*.exe
-	rm -rf ../../build/*
\ No newline at end of file
+	rm -rf ../../build/*
diff --git a/pkg/windows/README.rst b/pkg/windows/README.rst
index 0bdfb1d..6f1d7be 100644
--- a/pkg/windows/README.rst
+++ b/pkg/windows/README.rst
@@ -19,7 +19,7 @@ docker-compose
 Building the package
 ====================
 
-make pkg
+make bundle
 
 
 Reproducible builds
@@ -104,11 +104,11 @@ pyc and ui elements will mess up the binary in unpredictable ways.
 * copy the /var/src/bitmask sources to a read-write location (/var/build)
 * execute ```make all``` in wine to build the qt ui and other resources
 * execute ```pip install $dependencies``` to have all dependencies available
-* execute ```pyinstaller``` in wine to compile the executable for
-** bitmask (src/leap/bitmask/app.py)
-* cleanup
-** remove the read-write copy
-** remove wine-dlls from the installer
+* execute ```pyinstaller``` in wine to compile the executable for bitmask
+  (src/leap/bitmask/app.py)
+* cleanup:
+  ** remove the read-write copy
+  ** remove wine-dlls from the installer
 
 As the step 'install dependencies' may take long on slow internet connections
 during development it is advised to recycle the container and share the
@@ -141,4 +141,4 @@ Installer
 Installer is a straight forward debian image with makensis installed. The
 installer-build script lists the previously built files from pyinstaller and
 openvpn to pass it as nsh file to makensis. bitmask.nis controls what will
-be displayed to the user and how the components are installed and uninstalled
\ No newline at end of file
+be displayed to the user and how the components are installed and uninstalled
-- 
cgit v1.2.3