diary

commit 05b165836cc4ed7cab783d7404bcdaf16f66f789
parent 7265315d86624fcf1cc1dcc4ddf6da2a500aea8d
Author: in0rdr <andreas.gruhler@uzh.ch>
Date:   Thu, 24 Nov 2016 09:19:32 +0800

Merge branch 'master' of @shaggytwodope/diary

into shaggytwodope-master

Diffstat:
M
Makefile
 | 
2
+-
M
README.md
 | 
6
+++---
M
diary.c
 | 
2
+-

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ CFLAGS = -lncurses
 default: $(TARGET)
 
 $(TARGET): $(SRC)
-	$(CC) $(CFLAGS) $(SRC) -o $(TARGET)
+	$(CC) $(SRC) -o $(TARGET) $(CFLAGS)
 
 clean:
 	rm -f $(TARGET)
diff --git a/README.md b/README.md
@@ -29,9 +29,9 @@ This is a text based diary, inspired by [khal](https://github.com/pimutils/khal)
     diary ~/.diary
     ```
 
-   Instead of this, you can also set the environment variable `DIARY_DIR`
-   to the desired directory. If both an argument and the environment
-   variable are given, the argument takes precedence.
+    By default this will copy the binary to /usr/local/bin. To use a different
+    path prefix, type `sudo make --PREFIX=/usr install` to use /usr/bin for example.
+    You can uninstall diary with `sudo make uninstall`.
 
    The text files in this folder will be named 'yyyy-mm-dd'.
 
diff --git a/diary.c b/diary.c
@@ -241,7 +241,7 @@ int main(int argc, char** argv) {
         // use the environment variable if available
         env_var = getenv("DIARY_DIR");
         if (env_var == NULL) {
-            fprintf(stderr, "The diary directory must ge given as command line "
+            fprintf(stderr, "The diary directory must be given as command line "
                             "argument or in the DIARY_DIR environment variable\n");
             return 1;
         }