Merge remote-tracking branch 'origin/master'

Perry Werneck
2 parents eb9067be a9dc71c2
Showing 2 changed files with 23 additions and 1 deletions Show diff stats
.vscode/tasks.json
debian/rules
@@ -0,0 +1,22 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558 
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "type": "shell",
+            "label": "Make Debug",
+            "command": "make",
+            "args": [
+                "Debug"
+            ],
+            "problemMatcher": [
+                "$gcc"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            }
+        }
+    ]
+}
 \ No newline at end of file
@@ -56,7 +56,7 @@ install: build
 	make all
  
 	# Install lib3270
-	make DESTDIR=$(PWD)/debian/lib3270 -C src/lib3270 install-shared
+	make DESTDIR=$(PWD)/debian/lib3270 install-shared
 	find $(PWD)/debian/lib3270 -type f | sed -e "s@^$(PWD)/debian/lib3270/@/@g" > $(PWD)/debian/lib3270.install
  
 	# Install dev
...	...	@@ -0,0 +1,22 @@
	1	+{
	2	+ // See https://go.microsoft.com/fwlink/?LinkId=733558
	3	+ // for the documentation about the tasks.json format
	4	+ "version": "2.0.0",
	5	+ "tasks": [
	6	+ {
	7	+ "type": "shell",
	8	+ "label": "Make Debug",
	9	+ "command": "make",
	10	+ "args": [
	11	+ "Debug"
	12	+ ],
	13	+ "problemMatcher": [
	14	+ "$gcc"
	15	+ ],
	16	+ "group": {
	17	+ "kind": "build",
	18	+ "isDefault": true
	19	+ }
	20	+ }
	21	+ ]
	22	+}
0	23	\ No newline at end of file
...	...
...	...	@@ -56,7 +56,7 @@ install: build
56	56	make all
57	57
58	58	# Install lib3270
59		- make DESTDIR=$(PWD)/debian/lib3270 -C src/lib3270 install-shared
	59	+ make DESTDIR=$(PWD)/debian/lib3270 install-shared
60	60	find $(PWD)/debian/lib3270 -type f \| sed -e "s@^$(PWD)/debian/lib3270/@/@g" > $(PWD)/debian/lib3270.install
61	61
62	62	# Install dev
...	...