Merge pull request #57 from jszczerbinsky/dev

Dev

Makefile

@@ -9,12 +9,15 @@ all:
 	mkdir -p build/bin
 	mkdir -p build/share
 	mkdir -p build/share/ptSh
+	mkdir -p build/share/licenses
+	mkdir -p build/share/licenses/ptSh
 	gcc src/common/*.c src/ptls/*.c -lm -o build/bin/ptls
 	gcc src/common/*.c src/ptpwd/*.c -lm -o build/bin/ptpwd
 	gcc src/common/*.c src/ptcp/*.c -lm -o build/bin/ptcp
 	cp src/ptsh.sh build/bin/ptsh
 	cp src/config build/share/ptSh/config
 	cp LICENSE build/share/ptSh/LICENSE
+	cp LICENSE build/share/licenses/ptSh/LICENSE
 	cp src/logo.txt build/share/ptSh/logo.txt
 	echo "Version: " | tee build/share/ptSh/version.txt
 	echo $(VER) | tee -a build/share/ptSh/version.txt
@@ -25,8 +28,9 @@ install:
 	$(DESTDIR)/usr/bin/ptsh
 
 uninstall:
-	rm -rf /usr/share/ptSh
-	rm /usr/bin/ptls
-	rm /usr/bin/ptpwd
-	rm /usr/bin/ptcp
-	rm /usr/bin/ptsh
+	rm -rf $(DESTDIR)/usr/share/ptSh
+	rm $(DESTDIR)/usr/bin/ptls
+	rm $(DESTDIR)/usr/bin/ptpwd
+	rm $(DESTDIR)/usr/bin/ptcp
+	rm $(DESTDIR)/usr/bin/ptsh
+	rm -rf $(DESTDIR)/usr/share/licenses/ptSh

src/ptls/display.c

@@ -55,7 +55,8 @@ void displayBlock(Fields **fields, int count, ColumnSizes *cSize, Args* args, Pt
     actualColumn++;
     if(actualColumn >= columns)
     {
-      printf("\n");
+			if(i != count-1)
+				printf("\n");
       actualChar = 0;
       actualColumn = 0;
     }