Merge branch 'master' into devel

2 files changed, 22 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index a1624c8..a59ead3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,41 @@
 # gramscii - simple editor for ASCII box-and-arrow charts
+.POSIX:
 
 include config.mk
 
 SRC = gramscii.c
-INCLUDES = config.h
+INC = config.h
 
 all: options gramscii
 
 options:
 	@echo "-+- build options -+-"
-	@echo "PREFIX = $(PREFIX)"
-	@echo "CFLAGS = $(CFLAGS)"
-	@echo "CC     = $(CC)"
+	@echo "PREFIX  = $(PREFIX)"
+	@echo "CFLAGS  = $(CFLAGS)"
+	@echo "LDFLAGS = $(LDFLAGS)"
+	@echo "CC      = $(CC)"
 	@echo "-+-+-+-+-+-+-+-+-+-+-" 
 	
 
-gramscii: $(SRC) $(INCLUDES)
-	$(CC) $(CFLAGS) -o $@ $(SRC)
+gramscii: ${INC}
+
+clean:
+	@echo cleaning
+	@rm -f $(SRC:.c=)
 
 install: all
 	@echo installing executable to ${DESTDIR}${BINDIR}
 	@mkdir -p "${DESTDIR}${BINDIR}"
-	@cp -f ${NAME} "${DESTDIR}${BINDIR}"
-	@chmod 755 "${DESTDIR}${BINDIR}/${NAME}"
+	@cp -f gramscii "${DESTDIR}${BINDIR}"
+	@chmod 755 "${DESTDIR}${BINDIR}/gramscii"
 	@echo installing manpage to "${DESTDIR}${MANDIR}/man1"
 	@mkdir -p "${DESTDIR}${MANDIR}/man1"
-	@cp -f ${NAME}.1 "${DESTDIR}${MANDIR}/man1"
-	@chmod 644 "${DESTDIR}${MANDIR}/man1/${NAME}.1"
+	@cp -f gramscii.1 "${DESTDIR}${MANDIR}/man1"
+	@chmod 644 "${DESTDIR}${MANDIR}/man1/gramscii.1"
 
 uninstall:
 	@echo removing executable file from ${DESTDIR}${BINDIR}
-	@rm -f "${DESTDIR}${BINDIR}/${NAME}"
-	@echo removing manpage from "${DESTDIR}${MANDIR}"
-	@rm -f "${DESTDIR}${MANDIR}/man1/${NAME}.1"
+	@rm -f "${DESTDIR}${BINDIR}/gramscii"
+	@echo removing manpage from "${DESTDIR}${MANDIR}/man1"
+	@rm -f "${DESTDIR}${MANDIR}/man1/gramscii.1"
 
diff --git a/config.mk b/config.mk
index f17a5d6..f06b872 100644
--- a/config.mk
+++ b/config.mk
@@ -1,10 +1,6 @@
-NAME=gramscii
-VERSION=0.1
-
 PREFIX = /usr/local
-BINDIR = $(PREFIX)/bin
-MANDIR = $(PREFIX)/share/man
-
-CFLAGS=-O3 -std=c90 -pedantic -Wall
+BINDIR = ${PREFIX}/bin
+MANDIR = ${PREFIX}/share/man
 
-CC=cc
+CFLAGS = -O3 -std=c90 -pedantic -Wall
+##CC = cc