Cleanup in Makefile and docs according to tips from Nelson A. de Oliveira

2 files changed, 24 insertions, 35 deletions

diff --git a/Makefile b/Makefile
index 9d8c1f1..51c39dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 
-CC=gcc
-CCFLAGS= 
+CC?=gcc
+CFLAGS+= 
 
 all: macping mndp mactelnet mactelnetd
 
@@ -10,53 +10,43 @@ dist-clean:
 	rm -f mactelnet macping mactelnetd mndp
 	rm -f *.o
 
-strip-all: mndp macping mactelnet mactelnetd
-	strip -s mndp
-	strip -s macping
-	strip -s mactelnet
-	strip -s mactelnetd
-
-install: all strip-all install-docs
-	mkdir -p $(DESTDIR)/usr/bin
-	cp mndp $(DESTDIR)/usr/bin/
-	cp macping $(DESTDIR)/usr/bin/
-	cp mactelnet $(DESTDIR)/usr/bin/
-	mkdir -p $(DESTDIR)/usr/sbin
-	cp mactelnetd $(DESTDIR)/usr/sbin/
-	mkdir -p $(DESTDIR)/etc
-	cp config/mactelnetd.users $(DESTDIR)/etc/
-# Ubuntu upstart script
-#	cp config/mactelnetd.init /etc/init/
-	chown root $(DESTDIR)/etc/mactelnetd.users
-	chmod 600 $(DESTDIR)/etc/mactelnetd.users
+install: all install-docs
+	install -d $(DESTDIR)/usr/bin
+	install mndp $(DESTDIR)/usr/bin/
+	install macping $(DESTDIR)/usr/bin/
+	install mactelnet $(DESTDIR)/usr/bin/
+	install -d $(DESTDIR)/usr/sbin
+	install -o root mactelnetd $(DESTDIR)/usr/sbin/
+	install -d $(DESTDIR)/etc
+	install -m 600 -o root config/mactelnetd.users $(DESTDIR)/etc/
 
 install-docs:
-	mkdir -p $(DESTDIR)/usr/share/man/man1/
-	cp docs/*.1 $(DESTDIR)/usr/share/man/man1/
+	install -d $(DESTDIR)/usr/share/man/man1/
+	install docs/*.1 $(DESTDIR)/usr/share/man/man1/
 
 udp.o: udp.c udp.h
-	${CC} -Wall ${CCFLAGS} -c udp.c
+	${CC} -Wall ${CFLAGS} -c udp.c
 
 users.o: users.c users.h
-	${CC} -Wall ${CCFLAGS} -DUSERSFILE='"/etc/mactelnetd.users"' -c users.c
+	${CC} -Wall ${CFLAGS} -DUSERSFILE='"/etc/mactelnetd.users"' -c users.c
 
 protocol.o: protocol.c protocol.h
-	${CC} -Wall ${CCFLAGS} -c protocol.c
+	${CC} -Wall ${CFLAGS} -c protocol.c
 
 devices.o: devices.c devices.h
-	${CC} -Wall ${CCFLAGS} -c devices.c
+	${CC} -Wall ${CFLAGS} -c devices.c
 
 md5.o: md5.c md5.h
-	${CC} -Wall ${CCFLAGS} -c md5.c
+	${CC} -Wall ${CFLAGS} -c md5.c
 
 mactelnet: config.h udp.o mactelnet.c mactelnet.h protocol.o console.c console.h devices.o md5.o
-	${CC} -Wall ${CCFLAGS} -o mactelnet mactelnet.c udp.o protocol.o console.c devices.o md5.o
+	${CC} -Wall ${CFLAGS} -o mactelnet mactelnet.c udp.o protocol.o console.c devices.o md5.o
 
 mactelnetd: config.h mactelnetd.c udp.o protocol.o devices.o console.c console.h users.o users.h md5.o
-	${CC} -Wall ${CCFLAGS} -o mactelnetd mactelnetd.c udp.o protocol.o console.c devices.o users.o md5.o
+	${CC} -Wall ${CFLAGS} -o mactelnetd mactelnetd.c udp.o protocol.o console.c devices.o users.o md5.o
 
 mndp: config.h mndp.c protocol.o
-	${CC} -Wall ${CCFLAGS} -o mndp mndp.c protocol.o
+	${CC} -Wall ${CFLAGS} -o mndp mndp.c protocol.o
 
 macping: config.h macping.c udp.o devices.o protocol.o
-	${CC} -Wall ${CCFLAGS} -o macping macping.c devices.o udp.o protocol.o
+	${CC} -Wall ${CFLAGS} -o macping macping.c devices.o udp.o protocol.o
diff --git a/docs/mactelnetd.1 b/docs/mactelnetd.1
index dddf83e..40f9951 100644
--- a/docs/mactelnetd.1
+++ b/docs/mactelnetd.1
@@ -22,11 +22,10 @@ Show summary of options.
 .B \-v
 Show version of program.
 .SH FILES
-.BL -tag -width DS -compact
 .TP
 .B /etc/mactelnetd.users
-This file contains a line seperated list of users that will have
-access to your machine. Usernames and passwords are seperated
+This file contains a line separated list of users that will have
+access to your machine. Usernames and passwords are separated
 by colon. This file is read each time a user connects.
 .SH SEE ALSO
 .BR mndp (1),