From f25cf870e6279466c919a4e48dd50ae894e1abac Mon Sep 17 00:00:00 2001 From: Ansa89 Date: Fri, 19 Sep 2014 10:45:27 +0200 Subject: [PATCH 1/2] Makefile: use single quotes also for PACKAGE_DATADIR --- build/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/Makefile b/build/Makefile index c03e0de..b607812 100644 --- a/build/Makefile +++ b/build/Makefile @@ -7,7 +7,7 @@ LIBS = libtoxcore ncursesw libconfig CFLAGS = -std=gnu99 -pthread -Wall -g CFLAGS += '-DTOXICVER="$(VERSION)"' -DHAVE_WIDECHAR -D_XOPEN_SOURCE_EXTENDED -CFLAGS += -DPACKAGE_DATADIR="\"$(abspath $(DATADIR))\"" +CFLAGS += '-DPACKAGE_DATADIR="$(abspath $(DATADIR))"' CFLAGS += $(USER_CFLAGS) LDFLAGS = $(USER_LDFLAGS) @@ -50,11 +50,11 @@ all: toxic doc toxic: $(OBJ) @echo " LD $@" - @$(CC) $(CFLAGS) -o toxic $(OBJ) $(LDFLAGS) + $(CC) $(CFLAGS) -o toxic $(OBJ) $(LDFLAGS) %.o: $(SRC_DIR)/%.c @echo " CC $@" - @$(CC) $(CFLAGS) -o $*.o -c $(SRC_DIR)/$*.c + $(CC) $(CFLAGS) -o $*.o -c $(SRC_DIR)/$*.c @$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $*.d clean: From bd7b07315583a6c7af4b17fbc28823f7090ef1b3 Mon Sep 17 00:00:00 2001 From: Ansa89 Date: Fri, 19 Sep 2014 10:47:25 +0200 Subject: [PATCH 2/2] Makefile: fix typo --- build/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/Makefile b/build/Makefile index b607812..b1714a8 100644 --- a/build/Makefile +++ b/build/Makefile @@ -50,11 +50,11 @@ all: toxic doc toxic: $(OBJ) @echo " LD $@" - $(CC) $(CFLAGS) -o toxic $(OBJ) $(LDFLAGS) + @$(CC) $(CFLAGS) -o toxic $(OBJ) $(LDFLAGS) %.o: $(SRC_DIR)/%.c @echo " CC $@" - $(CC) $(CFLAGS) -o $*.o -c $(SRC_DIR)/$*.c + @$(CC) $(CFLAGS) -o $*.o -c $(SRC_DIR)/$*.c @$(CC) -MM $(CFLAGS) $(SRC_DIR)/$*.c > $*.d clean: